From aec500e038c52bd624b16113fed1f606fd24327f Mon Sep 17 00:00:00 2001 From: ronaxdevil Date: Mon, 21 Oct 2019 15:53:48 +0530 Subject: [PATCH] Revert "sanders: Copy vendor HIDL interface libs to /vendor" This reverts commit a2bcc013276985f24855d667c2f80ff49052ee66. Signed-off-by: ronaxdevil --- vndk/Android.mk | 20 +++++++------------- vndk/vndk-sp-libs.mk | 7 ------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/vndk/Android.mk b/vndk/Android.mk index c53f83e..81d67f8 100644 --- a/vndk/Android.mk +++ b/vndk/Android.mk @@ -6,9 +6,9 @@ include $(LOCAL_PATH)/vndk-sp-libs.mk vndk_sp_dir := vndk-sp-$(PLATFORM_VNDK_VERSION) -define define-vndk-lib +define define-vndk-sp-lib include $$(CLEAR_VARS) -LOCAL_MODULE := $1.$2 +LOCAL_MODULE := $1.vndk-sp-gen LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_PREBUILT_MODULE_FILE := $$(TARGET_OUT_INTERMEDIATE_LIBRARIES)/$1.so LOCAL_STRIP_MODULE := false @@ -16,14 +16,13 @@ LOCAL_MULTILIB := first LOCAL_MODULE_TAGS := optional LOCAL_INSTALLED_MODULE_STEM := $1.so LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_RELATIVE_PATH := $3 -LOCAL_VENDOR_MODULE := $4 +LOCAL_MODULE_RELATIVE_PATH := $(vndk_sp_dir) include $$(BUILD_PREBUILT) ifneq ($$(TARGET_2ND_ARCH),) ifneq ($$(TARGET_TRANSLATE_2ND_ARCH),true) include $$(CLEAR_VARS) -LOCAL_MODULE := $1.$2 +LOCAL_MODULE := $1.vndk-sp-gen LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_PREBUILT_MODULE_FILE := $$($$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)/$1.so LOCAL_STRIP_MODULE := false @@ -31,24 +30,19 @@ LOCAL_MULTILIB := 32 LOCAL_MODULE_TAGS := optional LOCAL_INSTALLED_MODULE_STEM := $1.so LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_RELATIVE_PATH := $3 -LOCAL_VENDOR_MODULE := $4 +LOCAL_MODULE_RELATIVE_PATH := $(vndk_sp_dir) include $$(BUILD_PREBUILT) endif # TARGET_TRANSLATE_2ND_ARCH is not true endif # TARGET_2ND_ARCH is not empty endef $(foreach lib,$(VNDK_SP_LIBRARIES),\ - $(eval $(call define-vndk-lib,$(lib),vndk-sp-gen,$(vndk_sp_dir),))) -$(foreach lib,$(EXTRA_VENDOR_LIBRARIES),\ - $(eval $(call define-vndk-lib,$(lib),vndk-ext-gen,,true))) + $(eval $(call define-vndk-sp-lib,$(lib)))) include $(CLEAR_VARS) LOCAL_MODULE := vndk-sp LOCAL_MODULE_TAGS := optional -LOCAL_REQUIRED_MODULES := \ - $(addsuffix .vndk-sp-gen,$(VNDK_SP_LIBRARIES)) \ - $(addsuffix .vndk-ext-gen,$(EXTRA_VENDOR_LIBRARIES)) +LOCAL_REQUIRED_MODULES := $(addsuffix .vndk-sp-gen,$(VNDK_SP_LIBRARIES)) include $(BUILD_PHONY_PACKAGE) vndk_sp_dir := diff --git a/vndk/vndk-sp-libs.mk b/vndk/vndk-sp-libs.mk index 744505f..0470c02 100644 --- a/vndk/vndk-sp-libs.mk +++ b/vndk/vndk-sp-libs.mk @@ -31,10 +31,3 @@ VNDK_SP_LIBRARIES := \ libutils \ libutilscallstack \ libdexfile \ - -EXTRA_VENDOR_LIBRARIES := \ - vendor.display.config@1.0 \ - vendor.display.config@1.1 \ - vendor.display.config@1.2 \ - vendor.nxp.nxpnfc@1.0 \ - vendor.qti.hardware.camera.device@1.0