diff options
| author | Alan Leung <acleung@google.com> | 2017-08-17 09:01:11 -0700 |
|---|---|---|
| committer | Alan Leung <acleung@google.com> | 2017-08-17 11:12:21 -0700 |
| commit | c9c077aa48cf655ced98f6f5fe3569985846f2dd (patch) | |
| tree | 2fdf699837566efa782bccb7831d18e7c1fa7dd5 | |
| parent | dabd313004429af7249c93872cdbb05d2c6461a2 (diff) | |
| parent | aae8dd63da65b54a6fd9cf87ee5075679ceabcb5 (diff) | |
| download | r8-c9c077aa48cf655ced98f6f5fe3569985846f2dd.tar.gz | |
Merge remote-tracking branch 'aosp/master' into reset
Change-Id: I6bb187d86c30883ed4cc36b1c89bedf45f5e30ba
Reset aosp/master to aosp/upstream-mirror
The only difference between R8 master and here will
just be Android.mk, manifest.txt and the pre-fetched
jar files in deps/
| -rw-r--r-- | Android.mk | 26 | ||||
| -rw-r--r-- | deps/asm-5.1.jar | bin | 0 -> 53468 bytes | |||
| -rw-r--r-- | deps/asm-commons-5.1.jar | bin | 0 -> 47195 bytes | |||
| -rw-r--r-- | deps/asm-tree-5.1.jar | bin | 0 -> 29130 bytes | |||
| -rw-r--r-- | deps/asm-util-5.1.jar | bin | 0 -> 43309 bytes | |||
| -rw-r--r-- | deps/commons-compress-1.12.jar | bin | 0 -> 442553 bytes | |||
| -rw-r--r-- | deps/fastutil-7.2.0.jar | bin | 0 -> 17309408 bytes | |||
| -rw-r--r-- | deps/guava-19.0.jar | bin | 0 -> 2308517 bytes | |||
| -rw-r--r-- | deps/jopt-simple-4.6.jar | bin | 0 -> 62477 bytes | |||
| -rw-r--r-- | manifest.txt | 1 |
10 files changed, 27 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk new file mode 100644 index 000000000..b24453122 --- /dev/null +++ b/Android.mk @@ -0,0 +1,26 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) +LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \ + d8-support-asm:deps/asm-5.1.jar \ + d8-support-asm-common:deps/asm-commons-5.1.jar \ + d8-support-asm-tree:deps/asm-tree-5.1.jar \ + d8-support-asm-util:deps/asm-util-5.1.jar \ + d8-support-common-compress:deps/commons-compress-1.12.jar \ + d8-support-fastutil:deps/fastutil-7.2.0.jar \ + d8-support-jopt:deps/jopt-simple-4.6.jar +include $(BUILD_HOST_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := d8 +LOCAL_JAR_MANIFEST := manifest.txt +LOCAL_SRC_FILES := $(call all-java-files-under,src/main) +LOCAL_STATIC_JAVA_LIBRARIES := \ + d8-support-asm \ + d8-support-asm-common \ + d8-support-asm-tree \ + d8-support-asm-util \ + d8-support-common-compress \ + d8-support-fastutil \ + d8-support-jopt \ + guavalib +include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/deps/asm-5.1.jar b/deps/asm-5.1.jar Binary files differnew file mode 100644 index 000000000..18433c1a2 --- /dev/null +++ b/deps/asm-5.1.jar diff --git a/deps/asm-commons-5.1.jar b/deps/asm-commons-5.1.jar Binary files differnew file mode 100644 index 000000000..2c8d5b478 --- /dev/null +++ b/deps/asm-commons-5.1.jar diff --git a/deps/asm-tree-5.1.jar b/deps/asm-tree-5.1.jar Binary files differnew file mode 100644 index 000000000..d0d1377ee --- /dev/null +++ b/deps/asm-tree-5.1.jar diff --git a/deps/asm-util-5.1.jar b/deps/asm-util-5.1.jar Binary files differnew file mode 100644 index 000000000..3aec15296 --- /dev/null +++ b/deps/asm-util-5.1.jar diff --git a/deps/commons-compress-1.12.jar b/deps/commons-compress-1.12.jar Binary files differnew file mode 100644 index 000000000..4867705ea --- /dev/null +++ b/deps/commons-compress-1.12.jar diff --git a/deps/fastutil-7.2.0.jar b/deps/fastutil-7.2.0.jar Binary files differnew file mode 100644 index 000000000..d5487ee7c --- /dev/null +++ b/deps/fastutil-7.2.0.jar diff --git a/deps/guava-19.0.jar b/deps/guava-19.0.jar Binary files differnew file mode 100644 index 000000000..b175ca867 --- /dev/null +++ b/deps/guava-19.0.jar diff --git a/deps/jopt-simple-4.6.jar b/deps/jopt-simple-4.6.jar Binary files differnew file mode 100644 index 000000000..a963d1fa4 --- /dev/null +++ b/deps/jopt-simple-4.6.jar diff --git a/manifest.txt b/manifest.txt new file mode 100644 index 000000000..08edb39c0 --- /dev/null +++ b/manifest.txt @@ -0,0 +1 @@ +Main-Class: com.android.tools.r8.compatdx.CompatDx |