From 6687ec44b22213b22bff4068afe53a0e99343511 Mon Sep 17 00:00:00 2001 From: Demon000 Date: Mon, 16 Aug 2021 12:33:00 +0200 Subject: [PATCH] sdm710-common: Build separate system and vendor HIDL libs and cleanup sdm710.mk Change-Id: If8e2211e643bdb0ff67fb248e7fe33b78077a06e --- libhidl/Android.bp | 5 ----- libhidl/Android.mk | 46 ++++++++++++++++++++++++++++++++++++++++++++++ sdm710.mk | 10 ++++------ 3 files changed, 50 insertions(+), 11 deletions(-) delete mode 100644 libhidl/Android.bp create mode 100644 libhidl/Android.mk diff --git a/libhidl/Android.bp b/libhidl/Android.bp deleted file mode 100644 index fd0b4a7..0000000 --- a/libhidl/Android.bp +++ /dev/null @@ -1,5 +0,0 @@ -cc_library { - name: "android.hidl.base@1.0", - shared_libs: ["libhidlbase"], - vendor_available: true, -} diff --git a/libhidl/Android.mk b/libhidl/Android.mk new file mode 100644 index 0000000..9d405a4 --- /dev/null +++ b/libhidl/Android.mk @@ -0,0 +1,46 @@ +# +# 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 := libhidltransport +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 := libhidltransport +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 := libhidltransport +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 := libhidltransport +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/sdm710.mk b/sdm710.mk index fea9609..d55ff17 100644 --- a/sdm710.mk +++ b/sdm710.mk @@ -183,6 +183,10 @@ PRODUCT_PACKAGES += \ # HIDL PRODUCT_PACKAGES += \ + android.hidl.base@1.0 \ + android.hidl.base@1.0_system \ + android.hidl.manager@1.0 \ + android.hidl.manager@1.0_system \ libhidltransport \ libhidltransport.vendor \ libhwbinder \ @@ -194,12 +198,6 @@ PRODUCT_PACKAGES += \ libqcomfm_jni \ qcom.fmradio -# HIDL -PRODUCT_PACKAGES += \ - android.hidl.base@1.0 \ - android.hidl.base@1.0.vendor \ - libhidltransport - # IMS PRODUCT_PACKAGES += \ ims-ext-common \