From 8085b952a5ae305154d2bfc62f2d39b81c0aa6d8 Mon Sep 17 00:00:00 2001 From: Demon Singur Date: Sat, 23 Jun 2018 05:22:18 +0000 Subject: wayne: Build separate system and vendor hidl libs Change-Id: If8e2211e643bdb0ff67fb248e7fe33b78077a06e --- device.mk | 4 +++- libhidl/Android.mk | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 9cb17db..f691c5c 100644 --- a/device.mk +++ b/device.mk @@ -236,7 +236,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 # IDC PRODUCT_COPY_FILES += \ 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) -- cgit v1.2.3