diff options
| author | Divya Sharma <divyash@codeaurora.org> | 2018-05-17 19:33:08 -0700 |
|---|---|---|
| committer | TingyiChen <tingyi364@gmail.com> | 2019-08-13 11:54:51 +0200 |
| commit | efbcab2a7ce38c2de7c31fa22c02a371cdf2e04a (patch) | |
| tree | 8ccad123559107fbf05a0c81af437e3841198c42 | |
| parent | 616a9e6010ec8a7998c3efff52c94a08d68d0621 (diff) | |
wayne-common: Migrate to versioned VNDK layout
Bug: 78605339
Test: boots
Change-Id: I43a22047d0bd21c57a2eee866799a96582aa6d70
| -rw-r--r-- | vndk/Android.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vndk/Android.mk b/vndk/Android.mk index 8a1f24b..81d67f8 100644 --- a/vndk/Android.mk +++ b/vndk/Android.mk @@ -4,6 +4,8 @@ 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 @@ -14,7 +16,7 @@ LOCAL_MULTILIB := first LOCAL_MODULE_TAGS := optional LOCAL_INSTALLED_MODULE_STEM := $1.so LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_RELATIVE_PATH := vndk-sp +LOCAL_MODULE_RELATIVE_PATH := $(vndk_sp_dir) include $$(BUILD_PREBUILT) ifneq ($$(TARGET_2ND_ARCH),) @@ -28,7 +30,7 @@ LOCAL_MULTILIB := 32 LOCAL_MODULE_TAGS := optional LOCAL_INSTALLED_MODULE_STEM := $1.so LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_RELATIVE_PATH := vndk-sp +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 @@ -42,4 +44,6 @@ 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 |