Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1e9d4f6 authored by Jae Shin's avatar Jae Shin
Browse files

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
parent c4ae41b2

core/tasks/vndk.mk

+4 −2
Original line number Diff line number Diff line
@@ -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