Merge "Additionally check TARGET_IS_64_BIT for binder bitness"

am: bd74c0cb0e

Change-Id: Id56ca32e6a810cacdc71776abfda69e9f76edaed
This commit is contained in:
Jae Shin
2018-07-24 02:18:19 -07:00
committed by android-build-merger

View File

@@ -145,9 +145,11 @@ vndk_snapshot_configs := \
# vndk_snapshot_zip
vndk_snapshot_variant := $(vndk_snapshot_out)/$(TARGET_ARCH)
binder :=
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)))
vndk_snapshot_zip := $(PRODUCT_OUT)/android-vndk-$(TARGET_PRODUCT).zip