From fe88f9cab1c0210c6c0a392b59a56cf45a4191ca Mon Sep 17 00:00:00 2001 From: GuaiYiHu Date: Wed, 10 Apr 2019 13:13:49 +0800 Subject: wayne-common: libhidl: Remove android.hidl.manager * Also move android.hidl.base@1.0 to system Change-Id: I06695669f988f28ebfc2016030033f419bb95191 Signed-off-by: PIPIPIG233666 <2212848813@qq.com> --- libhidl/Android.mk | 25 ------------------------- wayne.mk | 5 +---- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/libhidl/Android.mk b/libhidl/Android.mk index 9d405a4..b709215 100644 --- a/libhidl/Android.mk +++ b/libhidl/Android.mk @@ -18,29 +18,4 @@ 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/wayne.mk b/wayne.mk index ce97932..657f280 100644 --- a/wayne.mk +++ b/wayne.mk @@ -246,10 +246,7 @@ 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 + android.hidl.base@1.0 # IDC PRODUCT_COPY_FILES += \ -- cgit v1.2.3