diff options
| author | Siva Velusamy <vsiva@google.com> | 2014-02-12 16:45:38 -0800 |
|---|---|---|
| committer | Siva Velusamy <vsiva@google.com> | 2014-02-12 16:52:42 -0800 |
| commit | 24ad81ecdcfdf85b042601975ef30175fadbc0aa (patch) | |
| tree | 9dff4b012cd17fdc47151b4ec1c17942bc5ceedc /monitor | |
| parent | 17a66a85464985d0c35b49f4550f2cb823835b93 (diff) | |
| download | sdk-24ad81ecdcfdf85b042601975ef30175fadbc0aa.zip sdk-24ad81ecdcfdf85b042601975ef30175fadbc0aa.tar.gz sdk-24ad81ecdcfdf85b042601975ef30175fadbc0aa.tar.bz2 | |
Remove monitor temporarily from sdk builds (try 2)
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: Ibd701dc0fbd9b57441fa886fe701dcb71764e83a
Diffstat (limited to 'monitor')
| -rw-r--r-- | monitor/Android.mk | 9 |
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 |