diff options
| author | Siva Velusamy <vsiva@google.com> | 2014-02-12 16:44:02 -0800 |
|---|---|---|
| committer | Siva Velusamy <vsiva@google.com> | 2014-02-12 16:44:02 -0800 |
| commit | 7dda780983ae6d1064bc9ef64973122772b3fe5d (patch) | |
| tree | 134d648d71be3e8c9f90e49634a5740dea2ba3d2 /build | |
| parent | a77937f23970fc74391ebeb2079bc56e6779145e (diff) | |
| download | sdk-7dda780983ae6d1064bc9ef64973122772b3fe5d.zip sdk-7dda780983ae6d1064bc9ef64973122772b3fe5d.tar.gz sdk-7dda780983ae6d1064bc9ef64973122772b3fe5d.tar.bz2 | |
Revert "Remove monitor temporarily from sdk builds"
This reverts commit 0d723886ab5d3f7cf4ed2102be84fe482eeca3a0.
This breaks the windows build with the error:
make: *** No rule to make target `monitor', needed by `winsdk-tools'.
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 0587656..6e937ed 100644 --- a/build/product_sdk.mk +++ b/build/product_sdk.mk @@ -30,6 +30,7 @@ PRODUCT_PACKAGES += \ ant-glob \ annotations \ mksdcard \ + monitor \ fastboot \ emugen diff --git a/build/tools.darwin.atree b/build/tools.darwin.atree index c37480b..d584231 100644 --- a/build/tools.darwin.atree +++ b/build/tools.darwin.atree @@ -22,9 +22,9 @@ # Tools Component ############################################################################## -# RCP Monitor. Temporarily disabled: See b/8992787 -#bin/monitor tools/monitor -#eclipse/monitor-macosx.cocoa.x86_64/monitor tools/lib/monitor-x86_64 +# RCP Monitor. +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 58f3576..cdba1f2 100644 --- a/build/tools.linux.atree +++ b/build/tools.linux.atree @@ -22,10 +22,10 @@ # Tools Component ############################################################################## -# 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 +# 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 # swt diff --git a/build/tools.windows.atree b/build/tools.windows.atree index 36a6feb..5e5e766 100755 --- a/build/tools.windows.atree +++ b/build/tools.windows.atree @@ -93,13 +93,12 @@ rm tools/zipalign bin/zipalign.exe strip tools/zipalign.exe # RCP Monitor. Remove linux stuff and replace by Windows files. -# 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 +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 |