Merge "Add android-all 13 dependencies for update.gradle"
diff --git a/.prebuilt_info/prebuilt_info_common_ddmlib_annotations-prebuilt_jar.asciipb b/.prebuilt_info/prebuilt_info_common_ddmlib_annotations-prebuilt_jar.asciipb
index 37f8177..a5964d7 100644
--- a/.prebuilt_info/prebuilt_info_common_ddmlib_annotations-prebuilt_jar.asciipb
+++ b/.prebuilt_info/prebuilt_info_common_ddmlib_annotations-prebuilt_jar.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "9452240"
+ build_id: "9500536"
target: "studio-linux"
source_file: "artifacts/annotations.jar"
}
diff --git a/.prebuilt_info/prebuilt_info_common_ddmlib_ddmlib-prebuilt_jar.asciipb b/.prebuilt_info/prebuilt_info_common_ddmlib_ddmlib-prebuilt_jar.asciipb
index 78c91df..212b15e 100644
--- a/.prebuilt_info/prebuilt_info_common_ddmlib_ddmlib-prebuilt_jar.asciipb
+++ b/.prebuilt_info/prebuilt_info_common_ddmlib_ddmlib-prebuilt_jar.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "9452240"
+ build_id: "9500536"
target: "studio-linux"
source_file: "artifacts/ddmlib.jar"
}
diff --git a/common/commons-compress/Android.bp b/common/commons-compress/Android.bp
deleted file mode 100644
index 743a58b..0000000
--- a/common/commons-compress/Android.bp
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (C) 2016 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.
-
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-java_import_host {
- name: "commons-compress-prebuilt",
- jars: ["commons-compress-prebuilt.jar"],
- installable: true,
-}
diff --git a/common/commons-compress/MODULE_LICENSE_APL b/common/commons-compress/MODULE_LICENSE_APL
deleted file mode 100644
index e69de29..0000000
--- a/common/commons-compress/MODULE_LICENSE_APL
+++ /dev/null
diff --git a/common/commons-compress/PREBUILT b/common/commons-compress/PREBUILT
deleted file mode 100644
index 4f8c4dd..0000000
--- a/common/commons-compress/PREBUILT
+++ /dev/null
@@ -1,4 +0,0 @@
-commons-compress-prebuilt.jar in this prebuilt directory was copied from
- platform/prebuilts/devtools/tools/lib/common-compress-1.8.1.jar
-
-From version d054448a1147fc5294089b6ac7aa3abe92202761 of the platform/prebuilts/devtools project.
diff --git a/common/commons-compress/commons-compress-prebuilt.jar b/common/commons-compress/commons-compress-prebuilt.jar
deleted file mode 100644
index 66b0a56..0000000
--- a/common/commons-compress/commons-compress-prebuilt.jar
+++ /dev/null
Binary files differ
diff --git a/common/ddmlib/ddmlib-prebuilt.jar b/common/ddmlib/ddmlib-prebuilt.jar
index 90b6e6a..0235ff2 100644
--- a/common/ddmlib/ddmlib-prebuilt.jar
+++ b/common/ddmlib/ddmlib-prebuilt.jar
Binary files differ
