commit 993ffb802ee90e07e73e67e523fd040395dfd74d
author Elliott Hughes <enh@google.com> Tue Feb 11 22:01:32 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 11 22:01:32 2014 +0000
tree 68d1abee67a4461ac8754036f582800504347f0f
parent 90ed06ef84aee84dfc1edba1503a2b2036fc867d
parent e3b044a0cc5ffb4817dfba412118ee4a3d273b63

Merge "Add all-S-files-under."

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) \

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 \