OSDN Git Service

am 4aed6434: am 0b6ece9d: SDK: properly strip all SDK llvm-rs-cc linux binaries.
authorRaphael <raphael@google.com>
Thu, 23 Jun 2011 02:10:23 +0000 (19:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Jun 2011 02:10:23 +0000 (19:10 -0700)
* commit '4aed64341c6cff484c9b78fed3d13131049858c9':
  SDK: properly strip all SDK llvm-rs-cc linux binaries.

1  2 
core/Makefile

diff --cc core/Makefile
@@@ -1411,16 -1399,14 +1411,16 @@@ $(INTERNAL_SDK_TARGET): $(deps
                        -I $(TARGET_COMMON_OUT_ROOT) \
                        -v "PLATFORM_NAME=android-$(PLATFORM_VERSION)" \
                        -v "OUT_DIR=$(OUT_DIR)" \
 +                      -v "TARGET_ARCH=$(TARGET_ARCH)" \
 +                      -v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \
                        -o $(PRIVATE_DIR) && \
                cp -f $(target_notice_file_txt) \
 -                              $(PRIVATE_DIR)/platforms/android-$(PLATFORM_VERSION)/images/NOTICE.txt && \
 +                              $(PRIVATE_DIR)/platforms/android-$(PLATFORM_VERSION)/images/$(TARGET_CPU_ABI)/NOTICE.txt && \
                cp -f $(tools_notice_file_txt) $(PRIVATE_DIR)/tools/NOTICE.txt && \
                cp -f $(tools_notice_file_txt) $(PRIVATE_DIR)/platform-tools/NOTICE.txt && \
-               if [ -f $(PRIVATE_DIR)/platform-tools/llvm-rs-cc ]; then \
-                       $(HOST_STRIP_SDK_LLVM) $(PRIVATE_DIR)/platform-tools/llvm-rs-cc; \
-               fi && \
+               for f in $(PRIVATE_DIR)/platform-tools/llvm-rs-cc-* ; do \
+                       if [ -f "$$f" ]; then $(HOST_STRIP_SDK_LLVM) "$$f"; fi; \
+               done && \
                HOST_OUT_EXECUTABLES=$(HOST_OUT_EXECUTABLES) HOST_OS=$(HOST_OS) \
                        development/build/tools/sdk_clean.sh $(PRIVATE_DIR) && \
                chmod -R ug+rwX $(PRIVATE_DIR) && \