aboutsummaryrefslogtreecommitdiffstats
path: root/monitor
diff options
context:
space:
mode:
authorSiva Velusamy <vsiva@google.com>2014-02-12 14:16:38 -0800
committerSiva Velusamy <vsiva@google.com>2014-02-12 15:46:42 -0800
commit0d723886ab5d3f7cf4ed2102be84fe482eeca3a0 (patch)
tree5ddd34e13390efe55359816927f0559c04d1c480 /monitor
parent9d7c85a167f5be8086453e0d82d675ee4f80d4b1 (diff)
downloadsdk-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 'monitor')
-rw-r--r--monitor/Android.mk9
1 files changed, 9 insertions, 0 deletions
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