SDK: build 'monitor' tool and package it in the SDK.

Fixed with Siva to use the 'ant' builder from Eclipse's baseBuilder jars.

Changed to use:
- the new external/eclipse-basebuilder for the basebuilder jars.
- the rcp deltapack, located prebuilts/eclipse.
- monitor scripts are now in sdk/monitor.
- configuration is now in out/host/eclipse/rcp/build/configuration
  and doesn't change any existing repos.

Requires change I7ab027ff6 from build.git

Change-Id: I72fff09231fc9b3031c10eb42ff821c55af9b5d5

6 files changed, 17 insertions, 15 deletions

diff --git a/build/product_sdk.mk b/build/product_sdk.mk
index d54710f..7802211 100644
--- a/build/product_sdk.mk
+++ b/build/product_sdk.mk
@@ -35,6 +35,7 @@ PRODUCT_PACKAGES += \
 	lint \
 	mksdcard \
 	monkeyrunner \
+	monitor \
 	traceview
 
 # Native host Java libraries that are parts of the SDK.
diff --git a/build/sdk_only_whitelist.mk b/build/sdk_only_whitelist.mk
index 7a07297..3a7d9a3 100644
--- a/build/sdk_only_whitelist.mk
+++ b/build/sdk_only_whitelist.mk
@@ -54,6 +54,7 @@ subdirs += \
 	sdk/jarutils \
 	sdk/layoutlib_api \
 	sdk/manifmerger \
+	sdk/monitor \
 	sdk/ninepatch \
 	sdk/rule_api \
 	sdk/lint \
diff --git a/build/tools.darwin.atree b/build/tools.darwin.atree
index b5e852f..d584231 100644
--- a/build/tools.darwin.atree
+++ b/build/tools.darwin.atree
@@ -23,9 +23,8 @@
 ##############################################################################
 
 # RCP Monitor.
-# Not ready yet, fails due to missing "ant" on build servers
-# bin/monitor                                 tools/monitor
-# eclipse/monitor-macosx.cocoa.x86_64/monitor tools/lib/monitor-x86_64
+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 e9f6b2c..cdba1f2 100644
--- a/build/tools.linux.atree
+++ b/build/tools.linux.atree
@@ -23,10 +23,9 @@
 ##############################################################################
 
 # RCP Monitor.
-# Not ready yet, fails due to missing "ant" on build servers
-# 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
+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 bb5befa..66f375a 100755
--- a/build/tools.windows.atree
+++ b/build/tools.windows.atree
@@ -86,12 +86,13 @@ sdk/traceview/etc/traceview.bat                   tools/traceview.bat
 rm tools/zipalign
 bin/zipalign.exe                            strip tools/zipalign.exe
 
-# RCP Monitor.
-# Not ready yet, fails due to missing "ant" on build servers
-# rm tools/monitor
-# sdk/eclipse/scripts/rcp/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
+# 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
 
 
 # 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 5ddca7d..37a125c 100644
--- a/build/windows_sdk_tools.mk
+++ b/build/windows_sdk_tools.mk
@@ -13,9 +13,9 @@ WIN_SDK_TARGETS := \
 	find_java \
 	find_lock \
 	mksdcard \
+	monitor \
 	sdklauncher
 
-# monitor -- disabled due to build break
 
 # Add OpenGLES emulation host libraries if needed.
 ifeq (true,$(BUILD_EMULATOR_OPENGL))
@@ -28,5 +28,6 @@ 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 :=
+WIN_SDK_BUILD_PREREQ := \
+	monitor