openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "base_rules.mk: Don't use is_native for MULTILIB modules." am: 8d3fde909e 

am: cd81373d91

Change-Id: I962fee1551a3a3e6d8ecc265525c27308397ea7f
This commit is contained in:
Simran Basi 2018-01-09 05:32:30 +00:00 committed by android-build-merger
parent 179982709b cd81373d91
commit 59f7bfe4c3
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/base_rules.mk
View File

@ -499,18 +499,22 @@ ifdef LOCAL_COMPATIBILITY_SUITE
# separate the multiple architectures into subdirectories of the testcase folder. # separate the multiple architectures into subdirectories of the testcase folder.
arch_dir := arch_dir :=
is_native := is_native :=
multi_arch :=
ifeq ($(LOCAL_MODULE_CLASS),NATIVE_TESTS) ifeq ($(LOCAL_MODULE_CLASS),NATIVE_TESTS)
is_native := true is_native := true
multi_arch := true
endif endif
ifeq ($(LOCAL_MODULE_CLASS),NATIVE_BENCHMARK) ifeq ($(LOCAL_MODULE_CLASS),NATIVE_BENCHMARK)
is_native := true is_native := true
multi_arch := true
endif endif
ifdef LOCAL_MULTILIB ifdef LOCAL_MULTILIB
is_native := true multi_arch := true
endif endif
ifdef is_native ifdef multi_arch
arch_dir := /$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH) arch_dir := /$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)
endif endif
multi_arch :=
# The module itself. # The module itself.
$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \