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 

am: 59f7bfe4c3

Change-Id: I4c944657b3c8070526325c48daed8442f01e08a4
This commit is contained in:
Simran Basi 2018-01-09 06:24:41 +00:00 committed by android-build-merger
parent 3a8af7b92b 59f7bfe4c3
commit c8e38ea10d
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.
arch_dir :=
is_native :=
multi_arch :=
ifeq ($(LOCAL_MODULE_CLASS),NATIVE_TESTS)
is_native := true
multi_arch := true
endif
ifeq ($(LOCAL_MODULE_CLASS),NATIVE_BENCHMARK)
is_native := true
multi_arch := true
endif
ifdef LOCAL_MULTILIB
is_native := true
multi_arch := true
endif
ifdef is_native
ifdef multi_arch
arch_dir := /$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)
endif
multi_arch :=
# The module itself.
$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \