From 4918c5f37420db5c028a8f76723988b6e5f1dbd7 Mon Sep 17 00:00:00 2001 From: Demon Singur Date: Sat, 23 Jun 2018 05:22:18 +0000 Subject: [PATCH] sanders: Build separate system and vendor HIDL libs Change-Id: If8e2211e643bdb0ff67fb248e7fe33b78077a06e Signed-off-by: ashwatthama --- device.mk | 4 +++- libhidl/Android.mk | 17 ++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index 20c0aa4..9186038 100644 --- a/device.mk +++ b/device.mk @@ -208,7 +208,9 @@ PRODUCT_PACKAGES += \ # 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 # HW crypto PRODUCT_PACKAGES += \ diff --git a/libhidl/Android.mk b/libhidl/Android.mk index 1c521e1..39f4d64 100644 --- a/libhidl/Android.mk +++ b/libhidl/Android.mk @@ -24,7 +24,22 @@ 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)