diff options
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 | ||||
| -rw-r--r-- | build/windows_sdk_tools.mk | 6 | ||||
| -rw-r--r-- | build/windows_sdk_whitelist.mk | 1 |
6 files changed, 17 insertions, 18 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 diff --git a/build/windows_sdk_tools.mk b/build/windows_sdk_tools.mk index ee4ca7f..80f00c0 100644 --- a/build/windows_sdk_tools.mk +++ b/build/windows_sdk_tools.mk @@ -14,7 +14,6 @@ WIN_SDK_TARGETS := \ find_java \ find_lock \ mksdcard \ - monitor \ sdklauncher @@ -29,6 +28,7 @@ endif # Define the list of tool-dependent modules requisites needed # for the Windows SDK. These will be built using HOST_OS=linux. -WIN_SDK_BUILD_PREREQ := \ - monitor +# Temporarily disabled: See b/8992787 +#WIN_SDK_BUILD_PREREQ := \ +# monitor diff --git a/build/windows_sdk_whitelist.mk b/build/windows_sdk_whitelist.mk index f10545e..40b70e5 100644 --- a/build/windows_sdk_whitelist.mk +++ b/build/windows_sdk_whitelist.mk @@ -47,7 +47,6 @@ subdirs += \ external/junit \ sdk/apkbuilder \ sdk/eclipse/scripts/rcp \ - sdk/monitor \ sdk/testutils else |