Change more SDK libs to prebuilts.

Requires prebuilds/devtools.git I913a29e5f40db99871701461aad6fc38483015d2

To update the prebuilts, you need tools/base.git and the
prebuilts/devtools/update_jars.sh script.

This is supposed to be an intermediary step as we switch to tools/base.

Change-Id: I3dcccfdd9dc243a22a5bfd9db6779d24285db1ac

18 files changed, 113 insertions, 112 deletions

diff --git a/anttasks/Android.mk b/anttasks/Android.mk
index 9922f53..ae0c3a9 100644
--- a/anttasks/Android.mk
+++ b/anttasks/Android.mk
@@ -25,7 +25,8 @@ LOCAL_JAVA_LIBRARIES := \
         common \
         sdklib \
         manifmerger \
-        ant
+        ant \
+        guava-tools
 
 LOCAL_MODULE := anttasks
 
diff --git a/assetstudio/Android.mk b/assetstudio/Android.mk
index 88f4987..17f9415 100644
--- a/assetstudio/Android.mk
+++ b/assetstudio/Android.mk
@@ -16,8 +16,14 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under,src)
-LOCAL_JAVA_RESOURCE_DIRS := src
+# The assetstudio code has moved to tools/base/assetstudio.
+# The rule below uses the prebuilt assetstudio.jar.
+#
+# If you want to run the tests, cd to tools/base/assetstudio
+# and run ./gradlew :assetstudio:test
+
+LOCAL_MODULE := assetstudio
+LOCAL_MODULE_TAGS := optional
 
 # TODO: Replace common with the batik stuff
 LOCAL_JAVA_LIBRARIES := \
@@ -27,8 +33,8 @@ LOCAL_JAVA_LIBRARIES := \
 
 LOCAL_JAR_MANIFEST := etc/manifest.txt
 
-LOCAL_MODULE := assetstudio
+LOCAL_PREBUILT_JAVA_LIBRARIES := \
+	../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
 
-LOCAL_MODULE_TAGS := optional
+include $(BUILD_HOST_PREBUILT)
 
-include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/build/product_sdk.mk b/build/product_sdk.mk
index 226dba3..cf4879e 100644
--- a/build/product_sdk.mk
+++ b/build/product_sdk.mk
@@ -33,13 +33,11 @@ PRODUCT_PACKAGES += \
 	anttasks \
 	archquery \
 	assetstudio \
-	common-tests \
 	ddmlib \
 	ddms \
 	ddmuilib \
 	draw9patch \
 	dvlib \
-	dvlib-tests \
 	hierarchyviewer \
 	sdk_common \
 	layoutlib_api \
diff --git a/build/tools.atree b/build/tools.atree
index a8c9da6..f049e96 100644
--- a/build/tools.atree
+++ b/build/tools.atree
@@ -69,9 +69,9 @@ bin/draw9patch                      tools/draw9patch
 bin/traceview                       tools/traceview
 bin/android                         tools/android
 bin/monkeyrunner                    tools/monkeyrunner
-bin/lint                            tools/lint
 bin/uiautomatorviewer               tools/uiautomatorviewer
-prebuilts/devtools/jobb/etc/jobb    tools/jobb
+prebuilts/devtools/etc/jobb         tools/jobb
+prebuilts/devtools/etc/lint         tools/lint
 
 # sdk.git Ant templates for project build files
 sdk/templates/build.template        tools/lib/build.template
@@ -135,7 +135,7 @@ prebuilts/tools/common/http-client/commons-logging-1.1.1.jar
 prebuilts/tools/common/http-client/commons-codec-1.4.jar                            tools/lib/commons-codec-1.4.jar
 framework/emmalib.jar                                                               tools/lib/emma_device.jar
 external/emma/lib/emma.jar                                                          tools/lib/emma.jar
-external/emma/lib/emma_ant.jar                                                     tools/lib/emma_ant.jar
+external/emma/lib/emma_ant.jar                                                      tools/lib/emma_ant.jar
 prebuilts/tools/common/jfreechart/jcommon-1.0.12.jar                                tools/lib/jcommon-1.0.12.jar
 prebuilts/tools/common/jfreechart/jfreechart-1.0.9.jar                              tools/lib/jfreechart-1.0.9.jar
 prebuilts/tools/common/jfreechart/jfreechart-1.0.9-swt.jar                          tools/lib/jfreechart-1.0.9-swt.jar
@@ -191,7 +191,4 @@ sdk/files/typos                        tools/support
 
 sdk/testapps                      tests/testapps
 framework/ninepatch-tests.jar     tests/libtests/ninepatch-tests.jar
-framework/common-tests.jar        tests/libtests/common-tests.jar
-framework/layoutlib_api.jar       tests/libtests/layoutlib_api.jar
-framework/dvlib-tests.jar         tests/libtests/dvlib-tests.jar
 
diff --git a/build/tools.windows.atree b/build/tools.windows.atree
index f936d96..3a84ff8 100755
--- a/build/tools.windows.atree
+++ b/build/tools.windows.atree
@@ -37,10 +37,10 @@ rm tools/draw9patch
 sdk/draw9patch/etc/draw9patch.bat                 tools/draw9patch.bat
 
 rm tools/lint
-sdk/lint/cli/etc/lint.bat                         tools/lint.bat
+prebuilts/devtools/etc/lint.bat                   tools/lint.bat
 
 rm tools/jobb
-prebuilts/devtools/jobb/etc/jobb.bat              tools/jobb.bat
+prebuilts/devtools/etc/jobb.bat                   tools/jobb.bat
 
 
 rm tools/emulator
diff --git a/common/Android.mk b/common/Android.mk
index 85bcd60..dc098fd 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -16,13 +16,12 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under,src/main/java)
-
-LOCAL_JAR_MANIFEST := manifest.txt
+# The common code has moved to tools/base/common.
+# The rule below uses the prebuilt common.jar.
+#
+# If you want to run the tests, cd to tools/base/common
+# and run ./gradlew :common:test
 
-# IMPORTANT: if you add a new dependency here, please make sure
-# to also check the following files:
-#   common/manifest.txt
 LOCAL_JAVA_LIBRARIES := \
 	guava-tools
 
@@ -30,16 +29,8 @@ LOCAL_MODULE := common
 
 LOCAL_MODULE_TAGS := optional
 
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-# build the tests
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src/test/java)
-
-LOCAL_MODULE := common-tests
-LOCAL_MODULE_TAGS := optional
+LOCAL_PREBUILT_JAVA_LIBRARIES := \
+	../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
 
-LOCAL_JAVA_LIBRARIES := common junit
+include $(BUILD_HOST_PREBUILT)
 
-include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/ddms/libs/ddmlib/Android.mk b/ddms/libs/ddmlib/Android.mk
index c479e79..c5ad99e 100644
--- a/ddms/libs/ddmlib/Android.mk
+++ b/ddms/libs/ddmlib/Android.mk
@@ -26,7 +26,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_JAVA_LIBRARIES := kxml2-2.3.0
 
 LOCAL_PREBUILT_JAVA_LIBRARIES := \
-	../../../../prebuilts/devtools/$(LOCAL_MODULE)/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+	../../../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
 
 include $(BUILD_HOST_PREBUILT)
 
diff --git a/device_validator/dvlib/Android.mk b/device_validator/dvlib/Android.mk
index 8db8260..8d07043 100644
--- a/device_validator/dvlib/Android.mk
+++ b/device_validator/dvlib/Android.mk
@@ -15,27 +15,20 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
+# The dvlib code has moved to tools/base/dvlib.
+# The rule below uses the prebuilt dvlib.jar.
+#
+# If you want to run the tests, cd to tools/base/dvlib
+# and run ./gradlew :dvlib:test
+
 LOCAL_JAVA_RESOURCE_DIRS := src/main/resources
 
 LOCAL_MODULE := dvlib
 LOCAL_MODULE_TAGS := optional
 
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-
-# Build tests
+LOCAL_PREBUILT_JAVA_LIBRARIES := \
+	../../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
 
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src/test/java)
-LOCAL_JAVA_RESOURCE_DIRS := src/test/resources
-
-LOCAL_MODULE := dvlib-tests
-LOCAL_MODULE_TAGS := optional
+include $(BUILD_HOST_PREBUILT)
 
-LOCAL_JAVA_LIBRARIES := \
-	dvlib \
-	junit
 
-include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/jobb/Android.mk b/jobb/Android.mk
index 9865f30..1a58732 100644
--- a/jobb/Android.mk
+++ b/jobb/Android.mk
@@ -23,7 +23,7 @@ LOCAL_MODULE_TAGS := debug
 LOCAL_JAVA_LIBRARIES := fat32lib
 
 LOCAL_PREBUILT_JAVA_LIBRARIES := \
-	../../prebuilts/devtools/$(LOCAL_MODULE)/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+	../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
 
 include $(BUILD_HOST_PREBUILT)
 
diff --git a/layoutlib_api/Android.mk b/layoutlib_api/Android.mk
index 32ee53f..169cf37 100644
--- a/layoutlib_api/Android.mk
+++ b/layoutlib_api/Android.mk
@@ -16,7 +16,11 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under,src/main/java)
+# The layoutlib_api code has moved to tools/base/layoutlib_api.
+# The rule below uses the prebuilt layoutlib_api.jar.
+#
+# If you want to run the tests, cd to tools/base/layoutlib_api
+# and run ./gradlew :layoutlib_api:test
 
 LOCAL_JAVA_LIBRARIES := \
 	common \
@@ -24,17 +28,8 @@ LOCAL_JAVA_LIBRARIES := \
 
 LOCAL_MODULE := layoutlib_api
 
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-# build tests
-include $(CLEAR_VARS)
-
-# Only compile source java files in this lib.
-LOCAL_SRC_FILES := $(call all-java-files-under, src/test/java)
-
-LOCAL_MODULE := layoutlib_api-tests
-LOCAL_MODULE_TAGS := optional
+LOCAL_PREBUILT_JAVA_LIBRARIES := \
+	../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
 
-LOCAL_JAVA_LIBRARIES := layoutlib_api junit
+include $(BUILD_HOST_PREBUILT)
 
-include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/lint/cli/Android.mk b/lint/cli/Android.mk
index dcd1792..00c736b 100644
--- a/lint/cli/Android.mk
+++ b/lint/cli/Android.mk
@@ -1,14 +1,26 @@
 # Copyright 2011 The Android Open Source Project
 #
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
-LOCAL_JAVA_RESOURCE_DIRS := src/main/java
-
-LOCAL_JAR_MANIFEST := etc/manifest.txt
+# The lint code has moved to tools/base/lint.
+# The rule below uses the prebuilt lint.jar.
+#
+# If you want to run the tests, cd to tools/base/lint
+# and run ./gradlew :lint:test
 
-# If the dependency list is changed, etc/manifest.txt
 LOCAL_JAVA_LIBRARIES := \
 	common \
 	sdklib \
@@ -23,21 +35,8 @@ LOCAL_JAVA_LIBRARIES := \
 LOCAL_MODULE := lint
 LOCAL_MODULE_TAGS := optional
 
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-
-# Build all sub-directories
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-# Build tests
-include $(CLEAR_VARS)
-
-# Only compile source java files in this lib.
-LOCAL_SRC_FILES := $(call all-java-files-under, src/test/java)
-
-LOCAL_MODULE := lint_checks-tests
-LOCAL_MODULE_TAGS := optional
+LOCAL_PREBUILT_JAVA_LIBRARIES := \
+	../../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
 
-LOCAL_JAVA_LIBRARIES := common sdklib lint_api lint_checks lint junit easymock asm-tools asm-tree-tools guava-tools layoutlib_api sdktestutils
+include $(BUILD_HOST_PREBUILT)
 
-include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/lint/libs/lint_api/Android.mk b/lint/libs/lint_api/Android.mk
index 1d70a25..3510559 100644
--- a/lint/libs/lint_api/Android.mk
+++ b/lint/libs/lint_api/Android.mk
@@ -13,12 +13,14 @@
 # limitations under the License.
 
 LOCAL_PATH := $(call my-dir)
-
 include $(CLEAR_VARS)
 
-# Only compile source java files in this lib.
-LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
-LOCAL_JAVA_RESOURCE_DIRS := src/main/java
+# The lint_api code has moved to tools/base/lint_api.
+# The rule below uses the prebuilt lint_api.jar.
+#
+# If you want to run the tests, cd to tools/base/lint_api
+# and run ./gradlew :lint_api:test
+
 LOCAL_JAVA_LIBRARIES := \
 	lombok-ast-0.2 \
 	common \
@@ -31,7 +33,8 @@ LOCAL_JAVA_LIBRARIES := \
 LOCAL_MODULE := lint_api
 LOCAL_MODULE_TAGS := optional
 
-include $(BUILD_HOST_JAVA_LIBRARY)
+LOCAL_PREBUILT_JAVA_LIBRARIES := \
+	../../../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+
+include $(BUILD_HOST_PREBUILT)
 
-# Build all sub-directories
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/lint/libs/lint_checks/Android.mk b/lint/libs/lint_checks/Android.mk
index 30fc979..1382715 100644
--- a/lint/libs/lint_checks/Android.mk
+++ b/lint/libs/lint_checks/Android.mk
@@ -1,13 +1,27 @@
 # Copyright 2011 The Android Open Source Project
 #
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
+# The lint_checks code has moved to tools/base/lint_checks.
+# The rule below uses the prebuilt lint_checks.jar.
+#
+# If you want to run the tests, cd to tools/base/lint_checks
+# and run ./gradlew :lint_checks:test
 # Only compile source java files in this lib.
-LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
-LOCAL_JAVA_RESOURCE_DIRS := src/main/java
 
-# If the dependency list is changed, etc/manifest.txt
 LOCAL_JAVA_LIBRARIES := \
 	common \
 	sdklib \
@@ -22,5 +36,8 @@ LOCAL_JAVA_LIBRARIES := \
 LOCAL_MODULE := lint_checks
 LOCAL_MODULE_TAGS := optional
 
-include $(BUILD_HOST_JAVA_LIBRARY)
+LOCAL_PREBUILT_JAVA_LIBRARIES := \
+	../../../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+
+include $(BUILD_HOST_PREBUILT)
 
diff --git a/manifmerger/Android.mk b/manifmerger/Android.mk
index b1f1ac7..b07af36 100644
--- a/manifmerger/Android.mk
+++ b/manifmerger/Android.mk
@@ -16,7 +16,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 # The manifest-merger code has moved to tools/base/manifmerger.
-# The rule below uses the prebuilt manifmerger.jar if found.
+# The rule below uses the prebuilt manifmerger.jar.
 #
 # If you want to run the tests, cd to tools/base/manifmerger
 # and run ./gradlew :manifmerger:test
@@ -26,7 +26,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_JAVA_LIBRARIES := common sdklib
 
 LOCAL_PREBUILT_JAVA_LIBRARIES := \
-	../../prebuilts/devtools/$(LOCAL_MODULE)/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+	../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
 
 include $(BUILD_HOST_PREBUILT)
 
diff --git a/sdk_common/Android.mk b/sdk_common/Android.mk
index 51c5919..17c78cb 100644
--- a/sdk_common/Android.mk
+++ b/sdk_common/Android.mk
@@ -16,7 +16,11 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under,src)
+# The sdk_common code has moved to tools/base/sdk_common.
+# The rule below uses the prebuilt sdk_common.jar.
+#
+# If you want to run the tests, cd to tools/base/sdk_common
+# and run ./gradlew :sdk_common:test
 
 LOCAL_JAVA_LIBRARIES := \
 	layoutlib_api \
@@ -26,7 +30,10 @@ LOCAL_JAVA_LIBRARIES := \
 	sdklib
 
 LOCAL_MODULE := sdk_common
-
 LOCAL_MODULE_TAGS := optional
 
-include $(BUILD_HOST_JAVA_LIBRARY)
+LOCAL_PREBUILT_JAVA_LIBRARIES := \
+	../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+
+include $(BUILD_HOST_PREBUILT)
+
diff --git a/sdkmanager/libs/sdklib/Android.mk b/sdkmanager/libs/sdklib/Android.mk
index dfd3fcb..ef0362d 100644
--- a/sdkmanager/libs/sdklib/Android.mk
+++ b/sdkmanager/libs/sdklib/Android.mk
@@ -24,10 +24,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdklib
 LOCAL_MODULE_TAGS := optional
-# IMPORTANT: if you add a new dependency here, please make sure
-# to also check the following files:
-#   sdkmanager/sdklib/manifest.txt
-#   sdkmanager/app/etc/android.bat
+
 LOCAL_JAVA_LIBRARIES := \
         common \
         commons-codec-1.4 \
@@ -42,7 +39,7 @@ LOCAL_JAVA_LIBRARIES := \
         layoutlib_api
 
 LOCAL_PREBUILT_JAVA_LIBRARIES := \
-	../../../../prebuilts/devtools/$(LOCAL_MODULE)/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+	../../../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
 
 include $(BUILD_HOST_PREBUILT)
 
diff --git a/sdkmanager/libs/sdkuilib/Android.mk b/sdkmanager/libs/sdkuilib/Android.mk
index b746632..df35432 100644
--- a/sdkmanager/libs/sdkuilib/Android.mk
+++ b/sdkmanager/libs/sdkuilib/Android.mk
@@ -24,10 +24,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdkuilib
 LOCAL_MODULE_TAGS := optional
-# IMPORTANT: if you add a new dependency here, please make sure
-# to also check the following file:
-#   sdkmanager/app/etc/android.bat
-# (Note: there is no manifest.txt for sdkuilib.)
+
 LOCAL_JAVA_LIBRARIES := \
 	common \
 	commons-codec-1.4 \
@@ -45,7 +42,7 @@ LOCAL_JAVA_LIBRARIES := \
 	swtmenubar
 
 LOCAL_PREBUILT_JAVA_LIBRARIES := \
-	../../../../prebuilts/devtools/$(LOCAL_MODULE)/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+	../../../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
 
 include $(BUILD_HOST_PREBUILT)
 
diff --git a/swtmenubar/Android.mk b/swtmenubar/Android.mk
index 865c277..01e8645 100644
--- a/swtmenubar/Android.mk
+++ b/swtmenubar/Android.mk
@@ -26,7 +26,7 @@ LOCAL_JAVA_LIBRARIES := \
 	org.eclipse.jface_3.6.2.M20110210-1200
 
 LOCAL_PREBUILT_JAVA_LIBRARIES := \
-	../../prebuilts/devtools/$(LOCAL_MODULE)/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
+	../../prebuilts/devtools/$(LOCAL_MODULE)$(COMMON_JAVA_PACKAGE_SUFFIX)
 
 include $(BUILD_HOST_PREBUILT)