diff options
| author | Raphael Moll <ralf@android.com> | 2011-03-23 13:01:10 -0700 |
|---|---|---|
| committer | Raphael Moll <ralf@android.com> | 2011-03-23 13:01:10 -0700 |
| commit | ecd2f055e09ebe5a16244b91af1c6f80cae671a0 (patch) | |
| tree | 46521e6a8fcce72c7d8a1dd7606729cacb3ead51 /build/patch_windows_sdk.sh | |
| parent | 6abe1896a2099442787fd996ac833cdae76113eb (diff) | |
| download | sdk-ecd2f055e09ebe5a16244b91af1c6f80cae671a0.zip sdk-ecd2f055e09ebe5a16244b91af1c6f80cae671a0.tar.gz sdk-ecd2f055e09ebe5a16244b91af1c6f80cae671a0.tar.bz2 | |
Fix WIN SDK build: don't break if emulator-x86 is missing.
The core issue is why emulator-x86 is missing from the build.
Whilst we investigate why, this will unbreak the build. We should
revert this once the emu-x86 is built correctly again.
Change-Id: I4852490f1fea91ea18a798be28411f5a57a31a89
Diffstat (limited to 'build/patch_windows_sdk.sh')
| -rwxr-xr-x | build/patch_windows_sdk.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/patch_windows_sdk.sh b/build/patch_windows_sdk.sh index 1ef22eb..f2b0883 100755 --- a/build/patch_windows_sdk.sh +++ b/build/patch_windows_sdk.sh @@ -22,7 +22,8 @@ TOPDIR=${TOPDIR:-$3} # Remove obsolete stuff from tools TOOLS=$TEMP_SDK_DIR/tools LIB=$TEMP_SDK_DIR/tools/lib -rm $V $TOOLS/{android,apkbuilder,ddms,draw9patch,emulator-arm,emulator-x86} +rm -f $V $TOOLS/emulator-x86 # TODO make this conditional to fix build. Revert once we know why emu-x86 isn't build as expected (the goal here is to fail hard on errors, not ignore them silently.) +rm $V $TOOLS/{android,apkbuilder,ddms,draw9patch,emulator-arm} rm $V $TOOLS/{hierarchyviewer,layoutopt,mksdcard,traceview,monkeyrunner} rm $V $TOOLS/proguard/bin/*.sh |