StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Additionally check TARGET_IS_64_BIT for binder bitness" am: bd74c0cb0e am: 0b3a91c19d

Browse Source 
am: 157811e4dc

Change-Id: If6e7d4fc97b93365e80f29f952fd5176e063ac9f
This commit is contained in:
Jae Shin
2018-07-24 02:25:33 -07:00
committed by android-build-merger
parent 3f826938a5 157811e4dc
commit 0365608f48
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/tasks/vndk.mk
View File

@@ -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)))