From f1e9d4f62f8cd801a7c21c97e9e679b6a5f4e4de Mon Sep 17 00:00:00 2001 From: Jae Shin Date: Tue, 24 Jul 2018 16:12:42 +0900 Subject: [PATCH] Additionally check TARGET_IS_64_BIT for binder bitness Since TARGET_USES_64_BIT_BINDER could be not set, first check TARGET_IS_64_BIT when determining binder bitness. Test: lunch aosp_walleye-userdebug && m -j vndk, then check directory structure Bug: 111773572 Change-Id: If75d5946b38d7b5bc15798b273e0450035c8c43a --- core/tasks/vndk.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/tasks/vndk.mk b/core/tasks/vndk.mk index ba48df7a31..1bde7a61d5 100644 --- a/core/tasks/vndk.mk +++ b/core/tasks/vndk.mk @@ -145,8 +145,10 @@ vndk_snapshot_configs := \ # vndk_snapshot_zip vndk_snapshot_variant := $(vndk_snapshot_out)/$(TARGET_ARCH) binder := -ifneq ($(TARGET_USES_64_BIT_BINDER), true) - binder := binder32 +ifneq ($(TARGET_IS_64_BIT), true) + ifneq ($(TARGET_USES_64_BIT_BINDER), true) + binder := binder32 + endif 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)))