development
| Révision | 0221f2d8a084798d279ae8de9bb3a59d934b030f (tree) |
|---|---|
| l'heure | 2011-06-23 11:03:40 |
| Auteur | Raphael <raphael@goog...> |
| Commiter | Android Git Automerger |
am 320d10ef: Package the 2 llvm-rs-cc versions in the Windows SDK.
* commit '320d10ef623c04f3a2fa44af8823fa711a2e6573':
build/tools/patch_windows_sdk.sh (diff)
build/tools/windows_sdk.mk (diff)| @@ -6,7 +6,7 @@ | ||
| 6 | 6 | # platform-dependent folders and files. |
| 7 | 7 | # - sdk/build/patch_windows_sdk.sh to process folder and files which |
| 8 | 8 | # depend on the sdk.git repo. This file is invoked by the makefile |
| 9 | -# at development/tools/build/windows_sdk.mk. | |
| 9 | +# at development/build/tools/windows_sdk.mk. | |
| 10 | 10 | # |
| 11 | 11 | # Input arguments: |
| 12 | 12 | # -q = Optional arg to make this silent. Must be given first. |
| @@ -59,10 +59,10 @@ PLATFORM_TOOLS=$TEMP_SDK_DIR/platform-tools | ||
| 59 | 59 | LIB=$TEMP_SDK_DIR/tools/lib |
| 60 | 60 | rm $V $TOOLS/{dmtracedump,etc1tool,hprof-conv,sqlite3,zipalign} |
| 61 | 61 | rm $V $LIB/*/swt.jar |
| 62 | -rm $V $PLATFORM_TOOLS/{adb,aapt,aidl,dx,dexdump,llvm-rs-cc} | |
| 62 | +rm $V $PLATFORM_TOOLS/{adb,aapt,aidl,dx,dexdump,llvm-rs-cc,llvm-rs-cc-2} | |
| 63 | 63 | |
| 64 | 64 | # Copy all the new stuff in tools |
| 65 | -# Note: some tools are first copied here and then moved in platforms/<name>/tools/ | |
| 65 | +# Note: some tools are first copied here and then moved in platform-tools | |
| 66 | 66 | cp $V $WIN_OUT_DIR/host/windows-x86/bin/*.{exe,dll} $TOOLS/ |
| 67 | 67 | # Remove some tools we don't want to take in the SDK |
| 68 | 68 | rm $V -f $TOOLS/{fastboot.exe,rs-spec-gen.exe,tblgen.exe} |
| @@ -100,11 +100,14 @@ cp -r $V ${TOPDIR}external/sonivox/docs/JET_Creator_User_Manual_files $JETDOC/ | ||
| 100 | 100 | # Copy or move platform specific tools to the default platform. |
| 101 | 101 | cp $V ${TOPDIR}dalvik/dx/etc/dx.bat $PLATFORM_TOOLS/ |
| 102 | 102 | mv $V $TOOLS/{adb.exe,aapt.exe,aidl.exe,dexdump.exe} $PLATFORM_TOOLS/ |
| 103 | -mv $V $TOOLS/llvm-rs-cc.exe $PLATFORM_TOOLS/ | |
| 104 | 103 | mv $V $TOOLS/Adb*.dll $PLATFORM_TOOLS/ |
| 104 | +# The platform actually produces llvm-rs-cc-2 (via sdk.atree), whereas | |
| 105 | +# the original version 1 (just named llvm-rs-cc) is stored in the prebuilts. | |
| 106 | +cp $V ${TOPDIR}prebuilt/windows/llvm-rs-cc/llvm-rs-cc.exe $PLATFORM_TOOLS/llvm-rs-cc.exe | |
| 107 | +mv $V $TOOLS/llvm-rs-cc.exe $PLATFORM_TOOLS/llvm-rs-cc-2.exe | |
| 105 | 108 | |
| 106 | 109 | # Fix EOL chars to make window users happy - fix all files at the top level |
| 107 | -# as well as all batch files including those in platforms/<name>/tools/ | |
| 110 | +# as well as all batch files including those in platform-tools/ | |
| 108 | 111 | if [[ -x $UNIX2DOS ]]; then |
| 109 | 112 | find $TEMP_SDK_DIR -maxdepth 1 -name "*.[ht]*" -type f -print0 | xargs -0 $UNIX2DOS |
| 110 | 113 | find $TEMP_SDK_DIR -maxdepth 3 -name "*.bat" -type f -print0 | xargs -0 $UNIX2DOS |
| @@ -85,6 +85,7 @@ $(WIN_SDK_ZIP): winsdk-tools sdk | ||
| 85 | 85 | $(TOPDIR)development/build/tools/patch_windows_sdk.sh $(subst @,-q,$(hide)) \ |
| 86 | 86 | $(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR) |
| 87 | 87 | $(hide) strip --strip-all $(WIN_SDK_DIR)/$(WIN_SDK_NAME)/platform-tools/llvm-rs-cc.exe |
| 88 | + $(hide) strip --strip-all $(WIN_SDK_DIR)/$(WIN_SDK_NAME)/platform-tools/llvm-rs-cc-2.exe | |
| 88 | 89 | $(hide) $(TOPDIR)sdk/build/patch_windows_sdk.sh $(subst @,-q,$(hide)) \ |
| 89 | 90 | $(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR) |
| 90 | 91 | $(hide) ( \ |
mnstshlylh
Fork