diff --git a/vndk/Android.mk b/vndk/Android.mk index 81d67f81..8a1f24b0 100644 --- a/vndk/Android.mk +++ b/vndk/Android.mk @@ -4,8 +4,6 @@ LOCAL_PATH := $(call my-dir) include $(LOCAL_PATH)/vndk-sp-libs.mk -vndk_sp_dir := vndk-sp-$(PLATFORM_VNDK_VERSION) - define define-vndk-sp-lib include $$(CLEAR_VARS) LOCAL_MODULE := $1.vndk-sp-gen @@ -16,7 +14,7 @@ LOCAL_MULTILIB := first LOCAL_MODULE_TAGS := optional LOCAL_INSTALLED_MODULE_STEM := $1.so LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_RELATIVE_PATH := $(vndk_sp_dir) +LOCAL_MODULE_RELATIVE_PATH := vndk-sp include $$(BUILD_PREBUILT) ifneq ($$(TARGET_2ND_ARCH),) @@ -30,7 +28,7 @@ LOCAL_MULTILIB := 32 LOCAL_MODULE_TAGS := optional LOCAL_INSTALLED_MODULE_STEM := $1.so LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_RELATIVE_PATH := $(vndk_sp_dir) +LOCAL_MODULE_RELATIVE_PATH := vndk-sp include $$(BUILD_PREBUILT) endif # TARGET_TRANSLATE_2ND_ARCH is not true endif # TARGET_2ND_ARCH is not empty @@ -44,6 +42,4 @@ LOCAL_MODULE := vndk-sp LOCAL_MODULE_TAGS := optional LOCAL_REQUIRED_MODULES := $(addsuffix .vndk-sp-gen,$(VNDK_SP_LIBRARIES)) include $(BUILD_PHONY_PACKAGE) - -vndk_sp_dir := endif