diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 01:00:45 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 01:00:45 +0000 |
commit | 42e4e7457661648511b1e0785af52b3c2595e2df (patch) | |
tree | 88e6d89c8b67d7cec00d2d38584bd0f7ae30a581 | |
parent | 737c7032db500bd72bf8c5045116f18207602a9d (diff) | |
parent | e4b2cbd62723f711e40761c43d5b5f710a0a7d79 (diff) |
Snap for 7550740 from e4b2cbd62723f711e40761c43d5b5f710a0a7d79 to sdk-releaseplatform-tools-31.0.3
Change-Id: I4b487e0d38072ac6a3cf054cf5d3d041fd5e09ba
-rw-r--r-- | compatibility_matrix.xml | 8 | ||||
-rw-r--r-- | db845c.mk | 2 | ||||
-rw-r--r-- | db845c/device.mk | 6 | ||||
-rw-r--r-- | device-common.mk | 33 | ||||
-rw-r--r-- | libmemtrack/Android.mk | 31 | ||||
-rw-r--r-- | libmemtrack/memtrack_dragonboard.c | 45 | ||||
-rw-r--r-- | manifest.xml | 39 |
7 files changed, 30 insertions, 134 deletions
diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml index 3082485..f10b6bd 100644 --- a/compatibility_matrix.xml +++ b/compatibility_matrix.xml @@ -1,13 +1,5 @@ <compatibility-matrix version="1.0" type="device"> <hal format="hidl" optional="false"> - <name>android.frameworks.schedulerservice</name> - <version>1.0</version> - <interface> - <name>ISchedulingPolicyService</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl" optional="false"> <name>android.frameworks.sensorservice</name> <version>1.0</version> <interface> @@ -1,5 +1,5 @@ ifndef TARGET_KERNEL_USE -TARGET_KERNEL_USE := 5.4 +TARGET_KERNEL_USE := 5.10 endif DB845C_KERNEL_DIR := device/linaro/dragonboard-kernel/android-$(TARGET_KERNEL_USE) diff --git a/db845c/device.mk b/db845c/device.mk index e099c64..1b6907f 100644 --- a/db845c/device.mk +++ b/db845c/device.mk @@ -48,9 +48,9 @@ PRODUCT_PACKAGES := audio.primary.db845c # BootControl HAL PRODUCT_PACKAGES += \ - android.hardware.boot@1.1-impl \ - android.hardware.boot@1.1-impl.recovery \ - android.hardware.boot@1.1-service + android.hardware.boot@1.2-impl \ + android.hardware.boot@1.2-impl.recovery \ + android.hardware.boot@1.2-service PRODUCT_PACKAGES += \ pd-mapper \ diff --git a/device-common.mk b/device-common.mk index 0a04130..fa79ab0 100644 --- a/device-common.mk +++ b/device-common.mk @@ -23,7 +23,7 @@ DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay # Build and run only ART PRODUCT_RUNTIMES := runtime_libart_default -PRODUCT_SHIPPING_API_LEVEL := 29 +PRODUCT_SHIPPING_API_LEVEL := 31 PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false # Enable Scoped Storage related @@ -44,8 +44,8 @@ PRODUCT_PRODUCT_PROPERTIES := \ # Display PRODUCT_PACKAGES += \ - android.hardware.drm@1.0-impl \ - android.hardware.drm@1.0-service \ + android.hardware.drm@1.3-service.clearkey \ + android.hardware.drm@1.3-service.widevine \ android.hardware.graphics.allocator@2.0-impl \ android.hardware.graphics.allocator@2.0-service \ android.hardware.graphics.composer@2.2-impl \ @@ -91,12 +91,25 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \ frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml +# +# Power HAL +# +PRODUCT_PACKAGES += \ + android.hardware.power-service.example + +# +# PowerStats HAL +# +PRODUCT_PACKAGES += \ + android.hardware.power.stats-service.example + + # Audio PRODUCT_PACKAGES += \ - android.hardware.audio@4.0-impl:32 \ - android.hardware.audio.effect@4.0-impl:32 \ - android.hardware.audio@2.0-service \ - android.hardware.soundtrigger@2.0-impl \ + android.hardware.audio.service \ + android.hardware.audio@7.0-impl \ + android.hardware.audio.effect@7.0-impl \ + android.hardware.soundtrigger@2.2-impl \ android.hardware.bluetooth.audio@2.0-impl # Build default bluetooth a2dp and usb audio HALs @@ -143,12 +156,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/linaro/dragonboard/etc/permissions/android.software.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.xml -# Memtrack -PRODUCT_PACKAGES += \ - memtrack.default \ - android.hardware.memtrack@1.0-service \ - android.hardware.memtrack@1.0-impl - # Keymaster PRODUCT_PACKAGES += \ android.hardware.keymaster@3.0-impl \ diff --git a/libmemtrack/Android.mk b/libmemtrack/Android.mk deleted file mode 100644 index c52b417..0000000 --- a/libmemtrack/Android.mk +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (C) 2017 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := $(call my-dir) - -# HAL module implemenation stored in -# hw/<POWERS_HARDWARE_MODULE_ID>.<ro.hardware>.so -include $(CLEAR_VARS) - -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_PROPRIETARY_MODULE := true -LOCAL_C_INCLUDES += hardware/libhardware/include -LOCAL_CFLAGS := -Wconversion -Wall -Werror -Wno-sign-conversion -LOCAL_CLANG := true -LOCAL_SHARED_LIBRARIES := liblog libhardware -LOCAL_SRC_FILES := memtrack_dragonboard.c -LOCAL_MODULE := memtrack.default -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -include $(BUILD_SHARED_LIBRARY) diff --git a/libmemtrack/memtrack_dragonboard.c b/libmemtrack/memtrack_dragonboard.c deleted file mode 100644 index b7da750..0000000 --- a/libmemtrack/memtrack_dragonboard.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include <errno.h> - -#include <hardware/memtrack.h> - -int dragonboard_memtrack_init(const struct memtrack_module *module) -{ - if (!module) - return -1; - - return 0; -} - -static struct hw_module_methods_t memtrack_module_methods = { - .open = NULL, -}; - -struct memtrack_module HAL_MODULE_INFO_SYM = { - .common = { - .tag = HARDWARE_MODULE_TAG, - .module_api_version = MEMTRACK_MODULE_API_VERSION_0_1, - .hal_api_version = HARDWARE_HAL_API_VERSION, - .id = MEMTRACK_HARDWARE_MODULE_ID, - .name = "Dummy Memory Tracker HAL for Dragonboards", - .author = "The Android Open Source Project", - .methods = &memtrack_module_methods, - }, - - .init = dragonboard_memtrack_init, -}; diff --git a/manifest.xml b/manifest.xml index 2034741..b5587fa 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,8 +1,8 @@ -<manifest version="1.0" type="device" target-level="3"> +<manifest version="1.0" type="device" target-level="6"> <hal format="hidl"> <name>android.hardware.audio</name> <transport>hwbinder</transport> - <version>4.0</version> + <version>7.0</version> <interface> <name>IDevicesFactory</name> <instance>default</instance> @@ -11,7 +11,7 @@ <hal format="hidl"> <name>android.hardware.audio.effect</name> <transport>hwbinder</transport> - <version>4.0</version> + <version>7.0</version> <interface> <name>IEffectsFactory</name> <instance>default</instance> @@ -27,15 +27,6 @@ </interface> </hal> <hal format="hidl"> - <name>android.hardware.bluetooth.a2dp</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IBluetoothAudioOffload</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> <name>android.hardware.bluetooth.audio</name> <transport>hwbinder</transport> <version>2.0</version> @@ -45,18 +36,9 @@ </interface> </hal> <hal format="hidl"> - <name>android.hardware.configstore</name> - <transport>hwbinder</transport> - <version>1.1</version> - <interface> - <name>ISurfaceFlingerConfigs</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> <name>android.hardware.drm</name> <transport>hwbinder</transport> - <version>1.0</version> + <version>1.3</version> <interface> <name>ICryptoFactory</name> <instance>default</instance> @@ -115,19 +97,10 @@ <instance>default</instance> </interface> </hal> - <hal format="hidl"> - <name>android.hardware.memtrack</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IMemtrack</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> + <hal format="hidl"> <name>android.hardware.soundtrigger</name> <transport>hwbinder</transport> - <version>2.0</version> + <version>2.2</version> <interface> <name>ISoundTriggerHw</name> <instance>default</instance> |