Update tools-common prebuilts. [DO NOT MERGE]
The LayoutLib tests rely on the newer sdk-common, which depends on the
newer tools-common.
Not including the sdk-common from the original commit as it has been
updated separately.
Origin:
tools/base: @ 8303c1e4221a94bdc7589d1aef884fada1484fa6
Change-Id: I313b61511e98ac1402d75056ebfdeeb005ebb96d
(cherry picked from commit e94de12bb7f2dc8b147de9bd99c460859a4f16ff)
diff --git a/common/tools-common/Android.mk b/common/tools-common/Android.mk
index 4669f0e..505aacf 100644
--- a/common/tools-common/Android.mk
+++ b/common/tools-common/Android.mk
@@ -1,3 +1,17 @@
+# Copyright (C) 2014 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)
@@ -7,6 +21,7 @@
LOCAL_SRC_FILES := tools-common-prebuilt.jar
LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_BUILT_MODULE_STEM := javalib.jar
LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
include $(BUILD_PREBUILT)
diff --git a/common/tools-common/PREBUILT b/common/tools-common/PREBUILT
index 23448e4..34a9096 100644
--- a/common/tools-common/PREBUILT
+++ b/common/tools-common/PREBUILT
@@ -1,5 +1,5 @@
tools-common-prebuilt.jar in this prebuilt directory was copied from
platform/prebuilts/devtools/tools/lib/common.jar
-From version c1cc82fe500173f555fdc5fbd1e1aba940702e10 of the platform/prebuilts/devtools project.
+From version 8303c1e4221a94bdc7589d1aef884fada1484fa6 of the platform/prebuilts/devtools project.
diff --git a/common/tools-common/tools-common-prebuilt-sources.jar b/common/tools-common/tools-common-prebuilt-sources.jar
new file mode 100644
index 0000000..8b4b78d
--- /dev/null
+++ b/common/tools-common/tools-common-prebuilt-sources.jar
Binary files differ
diff --git a/common/tools-common/tools-common-prebuilt.jar b/common/tools-common/tools-common-prebuilt.jar
index b7aaa78..ddc4ac7 100644
--- a/common/tools-common/tools-common-prebuilt.jar
+++ b/common/tools-common/tools-common-prebuilt.jar
Binary files differ