commit b12cce10fab8c9adda213506be4ce675104655da
author Ying Wang <wangying@google.com> Wed Feb 12 01:26:10 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 12 01:26:10 2014 +0000
tree 0f0a04432b836d3bc4bf311b0cfe5aa69dd2800a
parent 993ffb802ee90e07e73e67e523fd040395dfd74d
parent 14a6cbd9026659b30f63c31e112d6cce9b47a9d6

Merge "Refine module name resolving in multilib build"

core/clang/TARGET_arm.mk

diff --git a/core/clang/TARGET_arm.mk b/core/clang/TARGET_arm.mk
index 373f276..f32bbfb 100644
--- a/core/clang/TARGET_arm.mk
+++ b/core/clang/TARGET_arm.mk
@@ -3,7 +3,7 @@
 
 CLANG_CONFIG_arm_TARGET_TRIPLE := arm-linux-androideabi
 CLANG_CONFIG_arm_TARGET_TOOLCHAIN_PREFIX := \
-  $(TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_arm_TARGET_TRIPLE)/bin
+  $($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_arm_TARGET_TRIPLE)/bin
 
 CLANG_CONFIG_arm_TARGET_EXTRA_ASFLAGS := \
   $(CLANG_CONFIG_EXTRA_ASFLAGS) \

core/clang/TARGET_mips.mk

diff --git a/core/clang/TARGET_mips.mk b/core/clang/TARGET_mips.mk
index 215a8ae..e70e254 100644
--- a/core/clang/TARGET_mips.mk
+++ b/core/clang/TARGET_mips.mk
@@ -3,7 +3,7 @@
 
 CLANG_CONFIG_mips_TARGET_TRIPLE := mipsel-linux-android
 CLANG_CONFIG_mips_TARGET_TOOLCHAIN_PREFIX := \
-  $(TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_mips_TARGET_TRIPLE)/bin
+  $($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_mips_TARGET_TRIPLE)/bin
 
 CLANG_CONFIG_mips_TARGET_EXTRA_ASFLAGS := \
   $(CLANG_CONFIG_EXTRA_ASFLAGS) \

core/clang/TARGET_x86.mk

diff --git a/core/clang/TARGET_x86.mk b/core/clang/TARGET_x86.mk
index 0178093..0f530b5 100644
--- a/core/clang/TARGET_x86.mk
+++ b/core/clang/TARGET_x86.mk
@@ -3,7 +3,7 @@
 
 CLANG_CONFIG_x86_TARGET_TRIPLE := i686-linux-android
 CLANG_CONFIG_x86_TARGET_TOOLCHAIN_PREFIX := \
-  $(TARGET_TOOLCHAIN_ROOT)/x86_64-linux-android/bin
+  $($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/x86_64-linux-android/bin
 
 CLANG_CONFIG_x86_TARGET_EXTRA_ASFLAGS := \
   $(CLANG_CONFIG_EXTRA_ASFLAGS) \

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index b34e274..e0e9608 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -275,6 +275,19 @@
 endef
 
 ###########################################################
+## Find all of the S files under the named directories.
+## Meant to be used like:
+##    SRC_FILES := $(call all-c-files-under,src tests)
+###########################################################
+
+define all-S-files-under
+$(patsubst ./%,%, \
+  $(shell cd $(LOCAL_PATH) ; \
+          find -L $(1) -name "*.S" -and -not -name ".*") \
+ )
+endef
+
+###########################################################
 ## Find all of the html files under the named directories.
 ## Meant to be used like:
 ##    SRC_FILES := $(call all-html-files-under,src tests)

target/product/core_minimal.mk

diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 79ba0d4..17000ac 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -37,6 +37,7 @@
     com.android.media.remotedisplay.xml \
     drmserver \
     framework-res \
+    idmap \
     installd \
     ip \
     ip-up-vpn \