diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2018-05-30 21:17:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-30 21:17:48 +0000 |
| commit | c99e68684cb7e6be32a3affb67dfd88d507b4bd1 (patch) | |
| tree | 7c778ea741995cec592c6ed9668eb517216e1472 | |
| parent | 5d356e2397fb704e82bc2345ccaa8e1c6de2da53 (diff) | |
| parent | 3ba44eb916563d16f68e06b50543c334fd48fa1f (diff) | |
| download | build-c99e68684cb7e6be32a3affb67dfd88d507b4bd1.tar.gz | |
Merge "Build VNDK snapshot for products aosp_[arm|x86]" into pi-dev
| -rw-r--r-- | core/tasks/vndk.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/core/tasks/vndk.mk b/core/tasks/vndk.mk index 3604aedf46..b9133df02f 100644 --- a/core/tasks/vndk.mk +++ b/core/tasks/vndk.mk @@ -141,9 +141,13 @@ vndk_snapshot_configs := \ ####################################### # vndk_snapshot_zip vndk_snapshot_variant := $(vndk_snapshot_out)/$(TARGET_ARCH) -vndk_lib_dir := $(vndk_snapshot_variant)/arch-$(TARGET_ARCH)-$(TARGET_ARCH_VARIANT) -vndk_lib_dir_2nd := $(vndk_snapshot_variant)/arch-$(TARGET_2ND_ARCH)-$(TARGET_2ND_ARCH_VARIANT) -vndk_snapshot_zip := $(PRODUCT_OUT)/android-vndk-$(TARGET_ARCH).zip +binder := +ifneq ($(TARGET_USES_64_BIT_BINDER), true) + binder := binder32 +endif +vndk_lib_dir := $(subst $(space),/,$(strip $(vndk_snapshot_variant) $(binder) arch-$(TARGET_ARCH)-$(TARGET_ARCH_VARIANT))) +vndk_lib_dir_2nd := $(subst $(space),/,$(strip $(vndk_snapshot_variant) $(binder) arch-$(TARGET_2ND_ARCH)-$(TARGET_2ND_ARCH_VARIANT))) +vndk_snapshot_zip := $(PRODUCT_OUT)/android-vndk-$(TARGET_PRODUCT).zip $(vndk_snapshot_zip): PRIVATE_VNDK_SNAPSHOT_OUT := $(vndk_snapshot_out) @@ -233,6 +237,7 @@ vndk_snapshot_top := vndk_snapshot_out := vndk_snapshot_configs_out := vndk_snapshot_variant := +binder := vndk_lib_dir := vndk_lib_dir_2nd := vndk_snapshot_dependencies := |