aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-02-06Merge "Build guava with core_current"android-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Treehugger Robot
2018-01-31Build guava with core_currentJiyong Park
Using core_current ensures that the module is not using any Android APIs (e.g. APIs under android.* packages), but only core Java APIs. Bug: 72206056 Test: m -j guava Change-Id: Ia41bf2188de76613f97016560c15e63d2a6ffd96
2017-10-23Merge "Convert external/guava to Android.bp"android-wear-8.0.0_r1android-o-mr1-iot-preview-6o-mr1-iot-preview-6Colin Cross
am: 7e8dbb922b Change-Id: I5f95796017de8db8e862bd10c83ab174632f7b40
2017-10-23Merge "Convert external/guava to Android.bp"Treehugger Robot
2017-10-20Convert external/guava to Android.bpColin Cross
See build/soong/README.md for more information. Test: m checkbuild Change-Id: Ib94a280deab2b0a4f4316d1e3d1070b51f4c67f5
2017-06-06Merge "Add OWNERS in external/guava" am: 5000b35f73 am: d0a206cac2 am: ↵oreo-mr1-devoreo-dr1-devChih-hung Hsieh
71d177e42a am: 5d824723be Change-Id: I32e75d4ac164bac1c3ff0873e9994d57ec0e2a18
2017-06-06Merge "Add OWNERS in external/guava" am: 5000b35f73 am: d0a206cac2android-o-mr1-preview-2android-o-mr1-preview-1Chih-hung Hsieh
am: 71d177e42a Change-Id: I0b8e228744efb2393c9390115c637fecc2063d61
2017-06-06Merge "Add OWNERS in external/guava" am: 5000b35f73Chih-hung Hsieh
am: d0a206cac2 Change-Id: I822117692294f3d7af156fb3b1fbd66c79f2daba
2017-06-06Merge "Add OWNERS in external/guava"Chih-hung Hsieh
am: 5000b35f73 Change-Id: I35a2523b74c068f4078ea2cd5a519026b8617cea
2017-06-06Merge "Add OWNERS in external/guava"android-o-preview-4android-o-iot-preview-5o-iot-preview-5Chih-hung Hsieh
2017-06-05Add OWNERS in external/guavaChih-Hung Hsieh
* Owners are selected from top CL approvals or owners. They will be suggested to review/approve future CLs. * OWNERS files are recognized by the new find-owners plugin, see .md files in https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/ Test: build/make/tools/checkowners.py -c -v OWNERS Change-Id: I7f69db069f73bcf36eefa0b1fb3f1488262bfe2b
2017-01-20Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for guava-hostdex" am: ↵android-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-releaseColin Cross
ebb96ab162 am: 2bb56c696b am: 6e08bec8ab am: b6c2a9cbfc Change-Id: I1a72b3d3b9971586f948f7fa08b282b51819d51e
2017-01-20Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for guava-hostdex" am: ↵android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4Colin Cross
ebb96ab162 am: 2bb56c696b am: 6e08bec8ab Change-Id: I439a1883a5ffda95c76d19907941f062edcc084d
2017-01-20Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for guava-hostdex" am: ↵Colin Cross
ebb96ab162 am: 2bb56c696b Change-Id: Iba9110f7b945278248320f17f9b5facc34aad0ee
2017-01-20Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for guava-hostdex"Colin Cross
am: ebb96ab162 Change-Id: I1231added43071a9b3bc608d7157714bad77fb32
2017-01-20Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for guava-hostdex"android-o-preview-1android-n-mr2-preview-2o-previewColin Cross
2017-01-19Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for guava-hostdexColin Cross
BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY must be used for libraries that will be linked with LOCAL_STATIC_JAVA_LIBRARIES. Test: m -j java Change-Id: I29c748cae19fd3fa50a6e492dcb550499bd62122
2016-05-03Merge "Backport: Work around a type inference change in javac" am: ↵Ian Rogers
a728081e33 am: 859d9ed5b3 am: 0839ba9a60 am: da6dc2f68a * commit 'da6dc2f68ad8b8e94d666d87b30b1ddda0c4f43c': Backport: Work around a type inference change in javac Change-Id: Ic3540200671f6cb01b20d4d4250eb08ff0e567cb
2016-05-03Merge "Backport: Work around a type inference change in javac" am: ↵android-n-mr2-preview-1Ian Rogers
a728081e33 am: 859d9ed5b3 am: 0839ba9a60 * commit '0839ba9a609002a4b29290a55caa125e363e629e': Backport: Work around a type inference change in javac Change-Id: I1c5229fdb8b66ee064ccfe33dc5c36c69f1d0a7c
2016-05-03Merge "Backport: Work around a type inference change in javac" am: a728081e33android-n-mr1-preview-2android-n-mr1-preview-1Ian Rogers
am: 859d9ed5b3 * commit '859d9ed5b3fc1b26c2b79bf7b3a956d7d492971b': Backport: Work around a type inference change in javac Change-Id: I20dc71c79ac17115f1993d1c6c22fdab7fb92a07
2016-05-03Merge "Backport: Work around a type inference change in javac"Ian Rogers
am: a728081e33 * commit 'a728081e33734f0f1b1260a98d6e6292dfcbd66c': Backport: Work around a type inference change in javac Change-Id: I2aaff9e7d36f9f3c045815738489ae12239cde8a
2016-05-03Merge "Backport: Work around a type inference change in javac"android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Ian Rogers
2016-04-29Backport: Work around a type inference change in javacIan Rogers
https://github.com/google/guava/commit/26342f6fe1f8b629a2ce1bdb3ef872f84a7e960a Bug: 27723540 Change-Id: Ib96fcf358f6c795c96b08214be7269d41f23eb02
2016-03-24build: Add host-side dalvik library rulesIgor Murashkin
am: 00d2a35 * commit '00d2a356b6f333177999ee9f723b9bdfa3fb9183': build: Add host-side dalvik library rules
2016-03-24build: Add host-side dalvik library rulesandroid-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1afw-test-harness-2.1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-releaseIgor Murashkin
Bug: 27552463 Change-Id: I71b4f3b26b9307b36444cecc75d67de03be9cb23 (cherry picked from commit f662447b974debfb0e4ffaa3cf5edfe6edc32f18)
2016-03-23Merge "build: Add host-side dalvik library rules"Igor Murashkin
am: 2dc668f * commit '2dc668f6c00d741cfc4b3778eca6953d87fe43ff': build: Add host-side dalvik library rules
2016-03-22Merge "build: Add host-side dalvik library rules"android-n-preview-2Igor Murashkin
2016-03-16build: Add host-side dalvik library rulesIgor Murashkin
Bug: 27552463 Change-Id: I71b4f3b26b9307b36444cecc75d67de03be9cb23
2016-02-24Merge "Pin libraries needed by vogar tool to java 1.7"Neil Fuller
am: 4cbc7336ad * commit '4cbc7336adb29ceac38d0f6e780be8afef53ca8b': Pin libraries needed by vogar tool to java 1.7
2016-02-24Merge "Pin libraries needed by vogar tool to java 1.7"android-n-preview-1Neil Fuller
2016-02-24Pin libraries needed by vogar tool to java 1.7Neil Fuller
vogar still uses javac/dx by default. dx does not handle v52 class files. The default java version is going to switch to 1.8. This change pins the targets need by vogar to 1.7. Bug: 26753820 Bug: 27310428 (cherry picked from commit d2d6de39e231863b8d91a0025f45637aaf400e3e) Change-Id: Ifab6ba8a23932b83d7aa41c4c5aef4d339db5265
2016-02-23Pin libraries needed by vogar tool to java 1.7Neil Fuller
vogar still uses javac/dx by default. dx does not handle v52 class files. The default java version is going to switch to 1.8. This change pins the targets need by vogar to 1.7. Bug: 26753820 Bug: 27310428 Change-Id: Ie06378b11acd2a96daf6ddd0f38ab2a90bcc9a88
2015-08-27am 412dd546: am 53ec5d4f: (-s ours) am ffcf8047: Merge "Backport Java 8 ↵Neil Fuller
compile time break workaround." * commit '412dd546124fc15a0a6236f0cd2077273ca30a70':
2015-08-27am 8a89bfad: am b1cf9c5f: (-s ours) am ff6b7322: Merge "Update the contents ↵Paul Duffin
of the README.android file to match the latest code" * commit '8a89bfadc93e8179cd10a43fec7dd1c56b696830':
2015-08-27am f508b7c8: am cf9ff873: (-s ours) am 7700d858: Merge "Added ↵Paul Duffin
Closeables.closeQuietly(Closeable) back" * commit 'f508b7c8f91cc1abe589e234da55ae06935ca398':
2015-08-27am a379fd74: am 919679d1: (-s ours) am 56d12685: Merge "Replaced usages of ↵Paul Duffin
Unsafe in UnsignedBytes with standard Java" * commit 'a379fd744f3c8595fc24e212ecec62ca7052a602':
2015-08-27am 7801334d: am a17878c7: (-s ours) am f0432edc: Merge "Replace usages of ↵Paul Duffin
Unsafe.compareAndSwap(Int|Long)" * commit '7801334db8a7979e0a7c9e2d8311089108e7b4b3':
2015-08-27am 689da217: am 058d2633: (-s ours) am 8dbb014e: Merge "Upgraded Guava to ↵Paul Duffin
unmodified v18.0" * commit '689da21779a1bdded3acbdbc86b34b37f1376561':
2015-08-27am 53ec5d4f: (-s ours) am ffcf8047: Merge "Backport Java 8 compile time ↵Neil Fuller
break workaround." * commit '53ec5d4fb1dcda4364d70de656d047b8953a79c3':
2015-08-27am b1cf9c5f: (-s ours) am ff6b7322: Merge "Update the contents of the ↵Paul Duffin
README.android file to match the latest code" * commit 'b1cf9c5f2a808612bdca0a0be44fd08d8921a508':
2015-08-27am cf9ff873: (-s ours) am 7700d858: Merge "Added ↵Paul Duffin
Closeables.closeQuietly(Closeable) back" * commit 'cf9ff873b8b66dfbfa17fcfbf2137b06683e9c2e':
2015-08-27am 919679d1: (-s ours) am 56d12685: Merge "Replaced usages of Unsafe in ↵Paul Duffin
UnsignedBytes with standard Java" * commit '919679d1ddcb9a8777c42780f44b202d17b8de29':
2015-08-27am a17878c7: (-s ours) am f0432edc: Merge "Replace usages of ↵Paul Duffin
Unsafe.compareAndSwap(Int|Long)" * commit 'a17878c7f54ae79bd82507514a40fcc008ded9a9':
2015-08-27am 058d2633: (-s ours) am 8dbb014e: Merge "Upgraded Guava to unmodified v18.0"Paul Duffin
* commit '058d26335e17388275188599afd35e4291313fb8':
2015-08-12am 696d5a21: am ffcf8047: Merge "Backport Java 8 compile time break workaround."Neil Fuller
* commit '696d5a21911109f696e794d1f48d8aa02e2d77ee': Backport Java 8 compile time break workaround.
2015-08-12am ffcf8047: Merge "Backport Java 8 compile time break workaround."Neil Fuller
* commit 'ffcf804746ba94d0c308c735c16696e68104f3f2': Backport Java 8 compile time break workaround.
2015-08-12am ffcf8047: Merge "Backport Java 8 compile time break workaround."Neil Fuller
* commit 'ffcf804746ba94d0c308c735c16696e68104f3f2': Backport Java 8 compile time break workaround.
2015-08-12Merge "Backport Java 8 compile time break workaround."android-m-preview-2Neil Fuller
2015-08-12Backport Java 8 compile time break workaround.C. Sean Young
Required for building host libraries with OpenJDK 8. Without this, trying to build with Java 8 fails with: external/guava/guava/src/com/google/common/reflect/Types.java:317: error: TypeVariableImpl is not abstract and does not override abstract method getAnnotatedBounds() in TypeVariable private static final class TypeVariableImpl<D extends GenericDeclaration> Backport of https://github.com/google/guava/commit/f4aa25e74a9466c2f93a2147a7cf9b01850dd41f See https://github.com/google/guava/issues/1738 Bug: 23074347 Change-Id: I35adc64a339055e1e426af2aa3a41058f9948984
2015-08-08am 85a2e6ca: am ff6b7322: Merge "Update the contents of the README.android ↵Paul Duffin
file to match the latest code" * commit '85a2e6cacfce1fe0d4c499637a9f30671dd545dc': Update the contents of the README.android file to match the latest code
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 08:21:03 +0000