diff options
| author | Colin Cross <ccross@android.com> | 2017-01-20 16:37:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-20 16:37:08 +0000 |
| commit | 773c486dafc60161bcae293de4a1c53d8c62a176 (patch) | |
| tree | 1d9008a885922d17215955146345c2c5d256f050 | |
| parent | ae1f8a73e84b105f2cc2c6f7c00be59b5bd48184 (diff) | |
| parent | b6c2a9cbfc282721643e7bae4b6c42808d6ed81c (diff) | |
| download | guava-oreo-release.tar.gz | |
Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for guava-hostdex" am: ebb96ab162 am: 2bb56c696b am: 6e08bec8abandroid-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-release
am: b6c2a9cbfc
Change-Id: I1a72b3d3b9971586f948f7fa08b282b51819d51e
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index b45f64a2b..40071503e 100644 --- a/Android.mk +++ b/Android.mk @@ -40,4 +40,4 @@ LOCAL_SRC_FILES := $(call all-java-files-under, guava/src) LOCAL_MODULE := guava-hostdex LOCAL_STATIC_JAVA_LIBRARIES := jsr305-hostdex -include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) +include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY) |