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

Merge "Allow to build native tests for translation arch only."

Browse Source 
am: c24740f

* commit 'c24740fdc874b5163fd02eb36811ff750d2acff8':
  Allow to build native tests for translation arch only.

Change-Id: I36f222f6b69737f280fac983f62a201a30f255b9
This commit is contained in:
Ying Wang
2016-04-20 21:03:35 +00:00
committed by android-build-merger
parent b7f7204f33 c24740fdc8
commit d4e3bb8acd
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/dex_preopt_odex_install.mk
View File

@@ -68,10 +68,12 @@ include $(BUILD_SYSTEM)/setup_one_odex.mk
# ################################################# # #################################################
# Odex for the 2nd arch # Odex for the 2nd arch
ifdef TARGET_2ND_ARCH ifdef TARGET_2ND_ARCH
ifneq ($(TARGET_TRANSLATE_2ND_ARCH),true)
ifneq (first,$(my_module_multilib)) ifneq (first,$(my_module_multilib))
my_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX) my_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX)
include $(BUILD_SYSTEM)/setup_one_odex.mk include $(BUILD_SYSTEM)/setup_one_odex.mk
endif # my_module_multilib is not first. endif # my_module_multilib is not first.
endif # TARGET_TRANSLATE_2ND_ARCH not true
endif # TARGET_2ND_ARCH endif # TARGET_2ND_ARCH
# ################################################# # #################################################
else # must be APPS else # must be APPS

5
core/executable.mk
View File

@@ -18,8 +18,13 @@ endif
ifneq (true,$(my_skip_this_target)) ifneq (true,$(my_skip_this_target))
ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true) 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 LOCAL_MULTILIB := first
endif endif
endif
my_prefix := TARGET_ my_prefix := TARGET_
include $(BUILD_SYSTEM)/multilib.mk include $(BUILD_SYSTEM)/multilib.mk