From e4b2cbd62723f711e40761c43d5b5f710a0a7d79 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Fri, 2 Jul 2021 21:23:59 +0000 Subject: db845c: Update PRODUCT_SHIPPING_API_LEVEL to 31 and FCM to 6 Update PRODUCT_SHIPPING_API_LEVEL and FCM for db845c so they are at 31 and 6 respectively. This also dropps the dummy memtrack HAL, as its no longer required. Signed-off-by: John Stultz Change-Id: I96fb44dbb54d8f51dee917175342ee734c074512 --- compatibility_matrix.xml | 8 ------- db845c/device.mk | 6 ++--- device-common.mk | 8 +------ libmemtrack/Android.mk | 31 -------------------------- libmemtrack/memtrack_dragonboard.c | 45 -------------------------------------- manifest.xml | 13 ++--------- 6 files changed, 6 insertions(+), 105 deletions(-) delete mode 100644 libmemtrack/Android.mk delete mode 100644 libmemtrack/memtrack_dragonboard.c diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml index 3082485..f10b6bd 100644 --- a/compatibility_matrix.xml +++ b/compatibility_matrix.xml @@ -1,12 +1,4 @@ - - android.frameworks.schedulerservice - 1.0 - - ISchedulingPolicyService - default - - android.frameworks.sensorservice 1.0 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 a996c4f..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 := 30 +PRODUCT_SHIPPING_API_LEVEL := 31 PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false # Enable Scoped Storage related @@ -156,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/..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 - -#include - -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 877987b..b5587fa 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,4 +1,4 @@ - + android.hardware.audio hwbinder @@ -97,16 +97,7 @@ default - - android.hardware.memtrack - hwbinder - 1.0 - - IMemtrack - default - - - + android.hardware.soundtrigger hwbinder 2.2 -- cgit v1.2.3