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

am 8e286fbf: am cf1b7d4b: Merge "Select src arch for prebuilts." 

* commit '8e286fbfc712ed695008f786592fe83e4a1331a7':
  Select src arch for prebuilts.
This commit is contained in:
Ying Wang 2014-03-11 18:16:49 +00:00 committed by Android Git Automerger
parent 4200387486 8e286fbfc7
commit 8ec7041127
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/definitions.mk
View File

@ -2144,6 +2144,13 @@ define include-if-build-from-source
$(if $(call if-build-from-source,$(2),$(3)),$(eval include $(1)))
endef
## Return the arch for the source file of a prebuilt
# $(1) the list of archs supported by the prebuilt
define get-prebuilt-src-arch
$(strip $(if $(filter $(TARGET_ARCH),$(1)),$(TARGET_ARCH),\
$(if $(filter $(TARGET_2ND_ARCH),$(1)),$(TARGET_2ND_ARCH))))
endef
###########################################################
## Other includes
###########################################################

4
core/prebuilt_internal.mk
View File

@ -21,9 +21,13 @@ LOCAL_DONT_CHECK_MODULE := true
ifdef LOCAL_PREBUILT_MODULE_FILE
my_prebuilt_src_file := $(LOCAL_PREBUILT_MODULE_FILE)
else
ifdef LOCAL_SRC_FILES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)
my_prebuilt_src_file := $(LOCAL_PATH)/$(LOCAL_SRC_FILES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))
else
my_prebuilt_src_file := $(LOCAL_PATH)/$(LOCAL_SRC_FILES)
endif
endif
ifdef LOCAL_IS_HOST_MODULE
my_prefix := HOST_