diff options
| author | Siva Velusamy <vsiva@google.com> | 2014-02-12 14:16:38 -0800 |
|---|---|---|
| committer | Siva Velusamy <vsiva@google.com> | 2014-02-12 15:46:42 -0800 |
| commit | 0d723886ab5d3f7cf4ed2102be84fe482eeca3a0 (patch) | |
| tree | 5ddd34e13390efe55359816927f0559c04d1c480 /build | |
| parent | 9d7c85a167f5be8086453e0d82d675ee4f80d4b1 (diff) | |
| download | sdk-0d723886ab5d3f7cf4ed2102be84fe482eeca3a0.zip sdk-0d723886ab5d3f7cf4ed2102be84fe482eeca3a0.tar.gz sdk-0d723886ab5d3f7cf4ed2102be84fe482eeca3a0.tar.bz2 | |
Remove monitor temporarily from sdk builds
This CL disables building of monitor from the SDK builds. This is
because the current PDE build doesn't work with Java7 on Macs. The
fix is to move away from PDE builds to Tycho, and that is going to
take a while. So we disable monitor until we move to Tycho.
Change-Id: I91282d93d54ed039e5356842e08320833ec441cd
Diffstat (limited to 'build')
| -rw-r--r-- | build/product_sdk.mk | 1 | ||||
| -rw-r--r-- | build/tools.darwin.atree | 6 | ||||
| -rw-r--r-- | build/tools.linux.atree | 8 | ||||
| -rwxr-xr-x | build/tools.windows.atree | 13 |
4 files changed, 14 insertions, 14 deletions
diff --git a/build/product_sdk.mk b/build/product_sdk.mk index 6e937ed..0587656 100644 --- a/build/product_sdk.mk +++ b/build/product_sdk.mk @@ -30,7 +30,6 @@ PRODUCT_PACKAGES += \ ant-glob \ annotations \ mksdcard \ - monitor \ fastboot \ emugen diff --git a/build/tools.darwin.atree b/build/tools.darwin.atree index d584231..c37480b 100644 --- a/build/tools.darwin.atree +++ b/build/tools.darwin.atree @@ -22,9 +22,9 @@ # Tools Component ############################################################################## -# RCP Monitor. -bin/monitor tools/monitor -eclipse/monitor-macosx.cocoa.x86_64/monitor tools/lib/monitor-x86_64 +# RCP Monitor. Temporarily disabled: See b/8992787 +#bin/monitor tools/monitor +#eclipse/monitor-macosx.cocoa.x86_64/monitor tools/lib/monitor-x86_64 # swt prebuilts/tools/darwin-x86/swt/swt.jar tools/lib/x86/swt.jar diff --git a/build/tools.linux.atree b/build/tools.linux.atree index cdba1f2..58f3576 100644 --- a/build/tools.linux.atree +++ b/build/tools.linux.atree @@ -22,10 +22,10 @@ # Tools Component ############################################################################## -# RCP Monitor. -bin/monitor tools/monitor -eclipse/monitor-linux.gtk.x86/monitor tools/lib/monitor-x86 -eclipse/monitor-linux.gtk.x86_64/monitor tools/lib/monitor-x86_64 +# RCP Monitor. Temporarily disabled: See b/8992787 +#bin/monitor tools/monitor +#eclipse/monitor-linux.gtk.x86/monitor tools/lib/monitor-x86 +#eclipse/monitor-linux.gtk.x86_64/monitor tools/lib/monitor-x86_64 # swt diff --git a/build/tools.windows.atree b/build/tools.windows.atree index 5e5e766..36a6feb 100755 --- a/build/tools.windows.atree +++ b/build/tools.windows.atree @@ -93,12 +93,13 @@ rm tools/zipalign bin/zipalign.exe strip tools/zipalign.exe # RCP Monitor. Remove linux stuff and replace by Windows files. -rm tools/monitor -rm tools/lib/monitor-x86 -rm tools/lib/monitor-x86_64 -sdk/monitor/monitor.bat tools/monitor.bat -eclipse/monitor-win32.win32.x86/monitor tools/lib/monitor-x86 -eclipse/monitor-win32.win32.x86_64/monitor tools/lib/monitor-x86_64 +# Temporarily disabled: See b/8992787 +#rm tools/monitor +#rm tools/lib/monitor-x86 +#rm tools/lib/monitor-x86_64 +#sdk/monitor/monitor.bat tools/monitor.bat +#eclipse/monitor-win32.win32.x86/monitor tools/lib/monitor-x86 +#eclipse/monitor-win32.win32.x86_64/monitor tools/lib/monitor-x86_64 # Copy the AVD & SDK Manager (aka avd/sdklauncher) to the root of the SDK as |