diff options
| author | 2016-04-20 11:53:39 -0700 | |
|---|---|---|
| committer | 2016-04-20 13:57:22 -0700 | |
| commit | 626302262c2ae203b639b2d391acbe372f1b7e5e (patch) | |
| tree | 2745e4092b3eccb409c66287e6671548228870da | |
| parent | e77e5e7b5ba8991323cd1c421e9076cbe46b2bb3 (diff) | |
Allow to build native tests for translation arch only.
- To build a native test for translation arch only, use:
LOCAL_MODULE_TARGET_ARCH := <translation arch>
- Also disable building .odex for translation arch for Java libraries.
Bug: 27526885
Change-Id: I063e8876781c4424da7abebf1b9b7cb842ce205f
(cherry-pick from commit d90eb21cd79fef3cc9566524d823cdf210799fcd)
| -rw-r--r-- | core/dex_preopt_odex_install.mk | 2 | ||||
| -rw-r--r-- | core/executable.mk | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index c3279f69fb..b7ecf2e717 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -68,10 +68,12 @@ include $(BUILD_SYSTEM)/setup_one_odex.mk # ################################################# # Odex for the 2nd arch ifdef TARGET_2ND_ARCH +ifneq ($(TARGET_TRANSLATE_2ND_ARCH),true) ifneq (first,$(my_module_multilib)) my_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX) include $(BUILD_SYSTEM)/setup_one_odex.mk endif # my_module_multilib is not first. +endif # TARGET_TRANSLATE_2ND_ARCH not true endif # TARGET_2ND_ARCH # ################################################# else # must be APPS diff --git a/core/executable.mk b/core/executable.mk index 1bd9db12ab..27c033d1c2 100644 --- a/core/executable.mk +++ b/core/executable.mk @@ -18,8 +18,13 @@ endif ifneq (true,$(my_skip_this_target)) ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true) +# If a native test explicity specifies to build only for the translation arch, +# we'll still need LOCAL_MULTILIB=both and let module_arch_supported.mk choose +# to build only for TARGET_2ND_ARCH. +ifneq (1,$(words $(LOCAL_MODULE_TARGET_ARCH))) LOCAL_MULTILIB := first endif +endif my_prefix := TARGET_ include $(BUILD_SYSTEM)/multilib.mk |