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

Commit 0b3a91c1 authored by Jae Shin's avatar Jae Shin Committed by android-build-merger
Browse files

Merge "Additionally check TARGET_IS_64_BIT for binder bitness" 

am: bd74c0cb

Change-Id: Id56ca32e6a810cacdc71776abfda69e9f76edaed
parents bf01d830 bd74c0cb

core/tasks/vndk.mk

+4 −2
Original line number Original line Diff line number Diff line
@@ -145,9 +145,11 @@ vndk_snapshot_configs := \ 
# vndk_snapshot_zip

# vndk_snapshot_zip

vndk_snapshot_variant := $(vndk_snapshot_out)/$(TARGET_ARCH)

vndk_snapshot_variant := $(vndk_snapshot_out)/$(TARGET_ARCH)

binder :=

binder :=

ifneq ($(TARGET_IS_64_BIT), true)

  ifneq ($(TARGET_USES_64_BIT_BINDER), true)

  ifneq ($(TARGET_USES_64_BIT_BINDER), true)

    binder := binder32

    binder := binder32

  endif

  endif

endif

vndk_lib_dir := $(subst $(space),/,$(strip $(vndk_snapshot_variant) $(binder) arch-$(TARGET_ARCH)-$(TARGET_ARCH_VARIANT)))

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_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 := $(PRODUCT_OUT)/android-vndk-$(TARGET_PRODUCT).zip