From 76bf85ebc9c39c00cd38defd833957f815e87301 Mon Sep 17 00:00:00 2001 From: Davide Garberi Date: Sat, 14 Jan 2023 16:19:59 +0100 Subject: msm8996-common: Switch to commonized libhidl shims Change-Id: I339c35b09c0efdc3ea9f06193844e711f58e1087 --- libhidl/Android.mk | 46 ---------------------------------------------- msm8996.mk | 4 ++-- 2 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 libhidl/Android.mk diff --git a/libhidl/Android.mk b/libhidl/Android.mk deleted file mode 100644 index b6d8426..0000000 --- a/libhidl/Android.mk +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (C) 2017 The LineageOS 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 $(CLEAR_VARS) -LOCAL_SHARED_LIBRARIES := libhidlbase -LOCAL_MODULE := android.hidl.base@1.0 -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_VENDOR_MODULE := true -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SHARED_LIBRARIES := libhidlbase -LOCAL_MODULE := android.hidl.manager@1.0 -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_VENDOR_MODULE := true -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SHARED_LIBRARIES := libhidlbase -LOCAL_MODULE := android.hidl.base@1.0_system -LOCAL_INSTALLED_MODULE_STEM := android.hidl.base@1.0.so -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SHARED_LIBRARIES := libhidlbase -LOCAL_MODULE := android.hidl.manager@1.0_system -LOCAL_INSTALLED_MODULE_STEM := android.hidl.manager@1.0.so -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -include $(BUILD_SHARED_LIBRARY) diff --git a/msm8996.mk b/msm8996.mk index d5ba607..01847eb 100755 --- a/msm8996.mk +++ b/msm8996.mk @@ -243,10 +243,10 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hidl.allocator@1.0.vendor \ android.hidl.base@1.0 \ - android.hidl.base@1.0_system \ + android.hidl.base@1.0.vendor \ android.hidl.manager@1.0-java \ android.hidl.manager@1.0 \ - android.hidl.manager@1.0_system \ + android.hidl.manager@1.0.vendor \ android.hidl.memory@1.0.vendor \ libhidltransport \ libhwbinder \ -- cgit v1.2.3