aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDemon Singur <demonsingur@gmail.com>2018-06-23 05:22:18 +0000
committerDavide Garberi <dade.garberi@gmail.com>2019-11-05 22:19:31 +0100
commit62ee596550905d68be2ca1ca0e7e63511ada0611 (patch)
treeeda84c3c28f16c198bbd65f146444e7a14a2dbcf
parent1644370bd398788529be4bdbcef7491696a3b760 (diff)
msm8996-common: Build separate system and vendor HIDL libs
Change-Id: If8e2211e643bdb0ff67fb248e7fe33b78077a06e
-rw-r--r--libhidl/Android.mk18
-rwxr-xr-xmsm8996.mk4
2 files changed, 21 insertions, 1 deletions
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)
diff --git a/msm8996.mk b/msm8996.mk
index dbea489..9941214 100755
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -227,8 +227,10 @@ PRODUCT_PACKAGES += \
# HIDL
PRODUCT_PACKAGES += \
android.hidl.base@1.0 \
+ android.hidl.base@1.0_system \
android.hidl.manager@1.0-java \
- android.hidl.manager@1.0
+ android.hidl.manager@1.0 \
+ android.hidl.manager@1.0_system
# IMS
PRODUCT_PACKAGES += \