diff options
| -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-- | monitor/Android.mk | 9 |
5 files changed, 23 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 diff --git a/monitor/Android.mk b/monitor/Android.mk index 60e4966..8e3f000 100644 --- a/monitor/Android.mk +++ b/monitor/Android.mk @@ -1,5 +1,13 @@ # Copyright 2012 The Android Open Source Project +# Temporarily disable building monitor +# The current mechanism for building monitor using PDE build does +# not work with Java7 on Macs. So building monitor is temporarily +# disabled until we figure out how to build monitor using Tycho +# and incorporate it into this build script. +# See b/8992787 +ifeq (0,1) + # Expose the Monitor RCP only for the SDK builds. ifneq (,$(is_sdk_build)$(filter sdk sdk_x86 sdk_mips,$(TARGET_PRODUCT))) @@ -60,3 +68,4 @@ $(LOCAL_BUILT_MODULE) : $(TOPDIR)sdk/monitor/monitor \ $(hide)$(ACP) -fp $(V) $(TOPDIR)sdk/monitor/monitor $@ endif +endif |