From c9301eb92ed818c68de13a209f04bc9036dcd3fe Mon Sep 17 00:00:00 2001 From: Demon Singur Date: Sat, 23 Jun 2018 05:22:18 +0000 Subject: [PATCH] sm6250-common: Build separate system and vendor HIDL libs Change-Id: If8e2211e643bdb0ff67fb248e7fe33b78077a06e --- common.mk | 4 +++- libhidl/Android.mk | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/common.mk b/common.mk index 603889b..2e99e93 100644 --- a/common.mk +++ b/common.mk @@ -26,7 +26,9 @@ PRODUCT_SHIPPING_API_LEVEL := 29 # HIDL PRODUCT_PACKAGES += \ android.hidl.base@1.0 \ - android.hidl.manager@1.0 + android.hidl.base@1.0_system \ + android.hidl.manager@1.0 \ + android.hidl.manager@1.0_system # Soong namespaces PRODUCT_SOONG_NAMESPACES += \ diff --git a/libhidl/Android.mk b/libhidl/Android.mk index 428655c..9d405a4 100644 --- a/libhidl/Android.mk +++ b/libhidl/Android.mk @@ -18,6 +18,7 @@ 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) @@ -25,4 +26,21 @@ 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)