diff options
-rw-r--r-- | compatibility_matrix.xml | 8 | ||||
-rw-r--r-- | device-common.mk | 7 | ||||
-rw-r--r-- | libmemtrack/Android.mk | 32 | ||||
-rw-r--r-- | libmemtrack/memtrack_hikey.c | 45 | ||||
-rw-r--r-- | manifest.xml | 11 | ||||
-rw-r--r-- | sepolicy/hal_memtrack.te | 11 |
6 files changed, 2 insertions, 112 deletions
diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml index 3082485c..f10b6bd5 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> diff --git a/device-common.mk b/device-common.mk index 89682f85..1eb2e56f 100644 --- a/device-common.mk +++ b/device-common.mk @@ -34,7 +34,7 @@ endif # Set vendor kernel path PRODUCT_VENDOR_KERNEL_HEADERS := device/linaro/hikey/kernel-headers -PRODUCT_SHIPPING_API_LEVEL := 30 +PRODUCT_SHIPPING_API_LEVEL := 31 PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false @@ -97,11 +97,6 @@ PRODUCT_PACKAGES += \ android.hardware.graphics.composer@2.1-service \ android.hardware.graphics.mapper@2.0-impl-2.1 \ -# Memtrack -PRODUCT_PACKAGES += memtrack.default \ - android.hardware.memtrack@1.0-service \ - android.hardware.memtrack@1.0-impl - ifeq ($(HIKEY_USE_LEGACY_TI_BLUETOOTH), true) PRODUCT_PACKAGES += android.hardware.bluetooth@1.0-service.hikey uim else diff --git a/libmemtrack/Android.mk b/libmemtrack/Android.mk deleted file mode 100644 index 630281f2..00000000 --- a/libmemtrack/Android.mk +++ /dev/null @@ -1,32 +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_hikey.c -LOCAL_MODULE := memtrack.default -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -#LOCAL_MODULE := memtrack.$(TARGET_BOARD_PLATFORM) -include $(BUILD_SHARED_LIBRARY) diff --git a/libmemtrack/memtrack_hikey.c b/libmemtrack/memtrack_hikey.c deleted file mode 100644 index d2ff1966..00000000 --- a/libmemtrack/memtrack_hikey.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 hikey_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 = "HiKey Memory Tracker HAL", - .author = "The Android Open Source Project", - .methods = &memtrack_module_methods, - }, - - .init = hikey_memtrack_init, -}; diff --git a/manifest.xml b/manifest.xml index ea3bf7a1..209d865e 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,4 +1,4 @@ -<manifest version="1.0" type="device" target-level="5"> +<manifest version="1.0" type="device" target-level="6"> <hal format="hidl"> <name>android.hardware.audio</name> <transport>hwbinder</transport> @@ -103,15 +103,6 @@ </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"> <name>android.hardware.renderscript</name> <transport arch="32+64">passthrough</transport> <version>1.0</version> diff --git a/sepolicy/hal_memtrack.te b/sepolicy/hal_memtrack.te deleted file mode 100644 index c2da1245..00000000 --- a/sepolicy/hal_memtrack.te +++ /dev/null @@ -1,11 +0,0 @@ -type debugfs_kgsl, debugfs_type, fs_type; - -allow domain debugfs_kgsl:dir search; - -allow hal_memtrack debugfs_kgsl:dir search; -allow hal_memtrack debugfs_kgsl:file { open read getattr }; - -# Memtrack reads proc/<pid>/cmdline to check if process is surfaceflinger. -# Grant access if that's the case; don't log denials for other processes. -allow hal_memtrack surfaceflinger:file read; -dontaudit hal_memtrack { domain -surfaceflinger}:file read; |