summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-10-22 01:37:10 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-10-22 01:37:10 +0000
commit893bb447284a94eeb7996f9545f904d285268f14 (patch)
treea77a83b6d626c661fcdf433a6e7230a6eeb5e711
parent68b778db591680faf12498e077038079da22c803 (diff)
parent38775e52b124a9c7f1bd93e6f6e30645aa782804 (diff)
downloadmisc-893bb447284a94eeb7996f9545f904d285268f14.tar.gz
Merge "Replace ASM 6.0_BETA with final release"
-rw-r--r--common/asm/Android.bp16
-rw-r--r--common/asm/PREBUILT2
-rw-r--r--common/asm/asm-6.0.jarbin0 -> 95209 bytes
-rw-r--r--common/asm/asm-6.0_BETA.jarbin56454 -> 0 bytes
-rw-r--r--common/asm/asm-analysis-6.0.jarbin0 -> 31021 bytes
-rw-r--r--common/asm/asm-analysis-6.0_BETA.jarbin20812 -> 0 bytes
-rw-r--r--common/asm/asm-commons-6.0.jarbin0 -> 77401 bytes
-rw-r--r--common/asm/asm-commons-6.0_BETA.jarbin51319 -> 0 bytes
-rw-r--r--common/asm/asm-tree-6.0.jarbin0 -> 48143 bytes
-rw-r--r--common/asm/asm-tree-6.0_BETA.jarbin33723 -> 0 bytes
-rw-r--r--common/asm/src-6.0.zip (renamed from common/asm/src-6.0_BETA.zip)bin429093 -> 651960 bytes
11 files changed, 9 insertions, 9 deletions
diff --git a/common/asm/Android.bp b/common/asm/Android.bp
index 1cfd948b..1256551a 100644
--- a/common/asm/Android.bp
+++ b/common/asm/Android.bp
@@ -33,22 +33,22 @@ java_import_host {
}
java_import_host {
- name: "asm-6.0_BETA",
- jars: ["asm-6.0_BETA.jar"],
+ name: "asm-6.0",
+ jars: ["asm-6.0.jar"],
}
java_import_host {
- name: "asm-analysis-6.0_BETA",
- jars: ["asm-analysis-6.0_BETA.jar"],
+ name: "asm-analysis-6.0",
+ jars: ["asm-analysis-6.0.jar"],
}
java_import_host {
- name: "asm-commons-6.0_BETA",
- jars: ["asm-commons-6.0_BETA.jar"],
+ name: "asm-commons-6.0",
+ jars: ["asm-commons-6.0.jar"],
}
java_import_host {
- name: "asm-tree-6.0_BETA",
- jars: ["asm-tree-6.0_BETA.jar"],
+ name: "asm-tree-6.0",
+ jars: ["asm-tree-6.0.jar"],
}
diff --git a/common/asm/PREBUILT b/common/asm/PREBUILT
index 44ca80d7..68748bab 100644
--- a/common/asm/PREBUILT
+++ b/common/asm/PREBUILT
@@ -2,4 +2,4 @@ The objects in this prebuilt directory can be rebuilt
using the source archive hosted at
http://download.forge.ow2.org/asm/asm-5.2.tar.gz
-http://download.forge.ow2.org/asm/asm-6.0_BETA.tar.gz
+http://download.forge.ow2.org/asm/asm-6.0.tar.gz
diff --git a/common/asm/asm-6.0.jar b/common/asm/asm-6.0.jar
new file mode 100644
index 00000000..cf2de272
--- /dev/null
+++ b/common/asm/asm-6.0.jar
Binary files differ
diff --git a/common/asm/asm-6.0_BETA.jar b/common/asm/asm-6.0_BETA.jar
deleted file mode 100644
index 6b2994de..00000000
--- a/common/asm/asm-6.0_BETA.jar
+++ /dev/null
Binary files differ
diff --git a/common/asm/asm-analysis-6.0.jar b/common/asm/asm-analysis-6.0.jar
new file mode 100644
index 00000000..6d8ae4fe
--- /dev/null
+++ b/common/asm/asm-analysis-6.0.jar
Binary files differ
diff --git a/common/asm/asm-analysis-6.0_BETA.jar b/common/asm/asm-analysis-6.0_BETA.jar
deleted file mode 100644
index a46662f8..00000000
--- a/common/asm/asm-analysis-6.0_BETA.jar
+++ /dev/null
Binary files differ
diff --git a/common/asm/asm-commons-6.0.jar b/common/asm/asm-commons-6.0.jar
new file mode 100644
index 00000000..33ba0c46
--- /dev/null
+++ b/common/asm/asm-commons-6.0.jar
Binary files differ
diff --git a/common/asm/asm-commons-6.0_BETA.jar b/common/asm/asm-commons-6.0_BETA.jar
deleted file mode 100644
index 6b2ae130..00000000
--- a/common/asm/asm-commons-6.0_BETA.jar
+++ /dev/null
Binary files differ
diff --git a/common/asm/asm-tree-6.0.jar b/common/asm/asm-tree-6.0.jar
new file mode 100644
index 00000000..2aa9815c
--- /dev/null
+++ b/common/asm/asm-tree-6.0.jar
Binary files differ
diff --git a/common/asm/asm-tree-6.0_BETA.jar b/common/asm/asm-tree-6.0_BETA.jar
deleted file mode 100644
index b82c68c0..00000000
--- a/common/asm/asm-tree-6.0_BETA.jar
+++ /dev/null
Binary files differ
diff --git a/common/asm/src-6.0_BETA.zip b/common/asm/src-6.0.zip
index fad057f4..bc54d004 100644
--- a/common/asm/src-6.0_BETA.zip
+++ b/common/asm/src-6.0.zip
Binary files differ