aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-11-07Use guava from the tree am: 23316ef610 am: dca05ffd5dr_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseColin Cross
am: 05598c0046 Change-Id: Ic6dceeb7aa96f41aa960a2f052d081259d845001
2019-11-07Restore checkerframework annotations am: 73a0dbfcc0 am: 6c3547da30Colin Cross
am: 1311f27c72 Change-Id: I4f90a96f28f199f28787e08a42c3cf5a4574a305
2019-11-07Use guava from the tree am: 23316ef610android-r-preview-4android-r-preview-3android-r-preview-2Colin Cross
am: dca05ffd5d Change-Id: I890c6463b019bf73beec7ec52fb65541fa7dbc09
2019-11-07Restore checkerframework annotations am: 73a0dbfcc0Colin Cross
am: 6c3547da30 Change-Id: If988f72eee35bf1b7638e0acb57ac1a0b57105e8
2019-11-07Use guava from the treeandroid-r-preview-1Colin Cross
am: 23316ef610 Change-Id: I0897e726552abfc988440364f17866c32869b8a4
2019-11-07Restore checkerframework annotationsColin Cross
am: 73a0dbfcc0 Change-Id: I419373af683907133c494fa13c38054dc9cf6ce3
2019-10-30Use guava from the treeColin Cross
external/guava is up to date now, use it instead of a prebuilt jar. Test: m turbine Change-Id: I6a6557c06f8e8cf984d47f36028a1805f632c3e8
2019-10-30Restore checkerframework annotationsColin Cross
I3e4794368c1369ccb32f24e55df030afe6a784d7 reverted upstream commit d0fcced7ecc9108d70ae2aea0ae3db00aacf3924 to move from checkerframework annotations back to jsr305 annotations. An upcoming turbine change uses the @Nullable in a location that is not valid for the jsr305 annotations but is valid for the checkerframework annotations. We don't have a real copy of the checkerframework annotations in the tree, but we do have a copy packaged into dagger2-auto-value. Restore the java/ directory to match upstream, and let dagger2-auto-value provide the annotations for now. Test: m turbine Change-Id: If7f38e6b54aba2581c0e82a311a1d8e0d5722181
2019-06-05Revert "Silence auto-value warning" am: 534a24a454 am: 862427da9b am: 6ee6b626a8Pete Gillin
am: 8960c383b4 Change-Id: I64ddc7ece20b1226628d2b8b85e55f139d1ce787
2019-06-05Revert "Silence auto-value warning" am: 534a24a454 am: 862427da9bPete Gillin
am: 6ee6b626a8 Change-Id: If06a8179174a7116e634ec788889e544a9a9e957
2019-06-05Revert "Silence auto-value warning" am: 534a24a454ndk-sysroot-r21Pete Gillin
am: 862427da9b Change-Id: If389a205d930446d3b1911fee97242426e4ce203
2019-06-05Revert "Silence auto-value warning"Pete Gillin
am: 534a24a454 Change-Id: I67f6e331bf9856ae44c617956c8878263f0f1533
2019-06-04Revert "Silence auto-value warning"Pete Gillin
This change is no longer needed, following http://r.android.com/943770 in April 2019, which upgraded external/dagger2 from a 2015 version of auto-common to version 0.10 (https://github.com/google/auto/releases/tag/auto-common-0.10). This auto-common version does not output code using javax.annotation.Generated if it is is not available, so the module that provides (java.xml.ws.annotation) it can be safely removed. This is beneficial since the module is deprecated in OpenJDK 9 and is removed in later versions. This reverts commit 87068a5236e63687231098ff446d9186b94ff00d. Bug: 62050818 Bug: 131683177 Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true make droid Change-Id: I08f9b0696f9c550789d101affb653c3e892da0f2
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: 391951aa1e Change-Id: If6b26e73b5e1bccede91bd91da07bf627ea96dbe
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I03bbafb7e7f323d333a6049000fb9499113dda41
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I57210ab397f218a65c832abcbee80f283df281a6
2019-02-04Silence auto-value warning am: 87068a5236 am: 33b0e9c3d3Colin Cross
am: 82a7e85118 Change-Id: Icc74389de21e54cfcd92d3f06bb467638fd151fd
2019-02-04Silence auto-value warning am: 87068a5236Colin Cross
am: 33b0e9c3d3 Change-Id: I8ee50489712568508dd490a40584564066d36bf5
2019-02-04Silence auto-value warningColin Cross
am: 87068a5236 Change-Id: Ie7ed14853d2c41608f053b4e9b33f1f58df4ea2e
2019-02-04Silence auto-value warningandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1Colin Cross
com.google.auto.value.extension.memoized.MemoizeExtension depends on javax.annotation.Generated, which is not visible by default in OpenJDK9. Expose the java.xml.ws.annotation module. Fixes: [ 65% 20175/31029] //external/turbine:turbine javac [linux_glibc common] warning: An exception occurred while looking for AutoValue extensions. No extensions will function. This may be due to a corrupt jar file in the compiler's classpath. Exception: java.util.ServiceConfigurationError: com.google.auto.value.extension.AutoValueExtension: Provider com.google.auto.value.extension.memoized.MemoizeExtension could not be instantiated 1 warning Bug: 62050818 Change-Id: If0b953dba477bb13bb2de90412a52bde80cb6316 Fixes: 123825567 Test: m turbine
2019-01-30Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
a8a207a9f1 am: 148c58934f am: d36ff02156 Change-Id: Ie3b73757720633e5cd3eb4489bab0652929e4041
2019-01-30Merge remote-tracking branch 'aosp/upstream-master' into master am: a8a207a9f1Colin Cross
am: 148c58934f Change-Id: Id6bab544479a2a6672c9d80cdd4258f8a1ba6baf
2019-01-30Merge remote-tracking branch 'aosp/upstream-master' into masterColin Cross
am: a8a207a9f1 Change-Id: Ia544fbfb5eab5dad0e8f244097bc3e236cf96fae
2019-01-29Merge remote-tracking branch 'aosp/upstream-master' into masterColin Cross
* aosp/upstream-master: Perform best-effort unescaping of command line options Fix error reporting for resolution failures on nested annotations Don't crash on type variables used as qualifiers in const exprs Use a newer version of guava Fix an NPE in constant expression binding of malformed annotations Reformat with google-java-format Miscellaneous cleanups Report diagnostics for unterminated expressions at the beginning of the expression instead of at the end of the file, which is probably farther from the problem. Fix error reporting for import resolution errors on nested types Add flag control for the reduced classpath optimization Bug: 122929601 Test: m checkbuild Change-Id: I30c0efadd5379f668772bc047d54ccfbbce118f8
2019-01-28Perform best-effort unescaping of command line optionscushon
ninja [1] shell-escapes paths that contain single quotes: https://android.googlesource.com/platform/external/ninja/+/6f903faaf5488dc052ffc4e3e0b12757b426e088/src/util.cc#274 MOE_MIGRATED_REVID=231341543
2019-01-28Fix error reporting for resolution failures on nested annotationscushon
MOE_MIGRATED_REVID=230994917
2019-01-28Don't crash on type variables used as qualifiers in const exprscushon
MOE_MIGRATED_REVID=230937580
2019-01-28Use a newer version of guavacushon
MOE_MIGRATED_REVID=226543883
2019-01-28Fix an NPE in constant expression binding of malformed annotationscushon
MOE_MIGRATED_REVID=226028069
2019-01-28Reformat with google-java-formatcushon
MOE_MIGRATED_REVID=225864459
2019-01-28Miscellaneous cleanupscushon
MOE_MIGRATED_REVID=225619145
2019-01-28Report diagnostics for unterminated expressions at the beginning of the ↵cushon
expression instead of at the end of the file, which is probably farther from the problem. MOE_MIGRATED_REVID=225615449
2019-01-28Fix error reporting for import resolution errors on nested typescushon
MOE_MIGRATED_REVID=222446808
2019-01-28Add flag control for the reduced classpath optimizationcushon
MOE_MIGRATED_REVID=222103042
2019-01-24Enable AutoValue in turbine am: bcab8b65c6 am: 44e0edb43bColin Cross
am: 6c76159f8d Change-Id: Ied33a7bef9890c22fc6a0dd6844b1260e5012839
2019-01-24Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
3fec25b908 am: 6d5f9e3e61 am: 9268aadd47 Change-Id: I300c56ac129ca793a656aeef30684e8432e0917e
2019-01-24Restore some errorprone annotations am: f39733ccf6 am: 2de126d986Colin Cross
am: bd5271b08e Change-Id: Ib26bad6f5e047125d11bf47726af1cd22fd0ef68
2019-01-24Enable AutoValue in turbine am: bcab8b65c6Colin Cross
am: 44e0edb43b Change-Id: Ie070b07372f99425091a81e9a163c191cc1e8a25
2019-01-24Merge remote-tracking branch 'aosp/upstream-master' into master am: 3fec25b908Colin Cross
am: 6d5f9e3e61 Change-Id: I06d4da764fa8be08604a3e9e52ef6130106b1148
2019-01-24Restore some errorprone annotations am: f39733ccf6Colin Cross
am: 2de126d986 Change-Id: I06cb41150c4a5ada4ae6ee4c1c1f62aa4109a2cf
2019-01-24Enable AutoValue in turbineColin Cross
am: bcab8b65c6 Change-Id: I4794783468f0b7b3d98e4c8297ba7bbcc478fab0
2019-01-24Merge remote-tracking branch 'aosp/upstream-master' into masterColin Cross
am: 3fec25b908 Change-Id: I1870c5f8c4e6fe78bf183698edd786c7c4278904
2019-01-24Restore some errorprone annotationsColin Cross
am: f39733ccf6 Change-Id: I006ece80290efd8ceb7227f7d8d9eb2192a2d068
2019-01-24Enable AutoValue in turbineColin Cross
Upstream turbine requires AutoValue now. Test: m checkbuild Change-Id: Ia2c4f198cbf7e3969cb52db3757ab1fc7a022112
2019-01-24Merge remote-tracking branch 'aosp/upstream-master' into masterColin Cross
Updates turbine to upstream 5a26f8cf360ab8f450d6268574a8a8ab50588d0d. Test: m checkbuild Change-Id: I611f1edd5c9a85cf06a23916410eb9b24cab811f
2019-01-24Restore some errorprone annotationsColin Cross
I3e4794368c1369ccb32f24e55df030afe6a784d7 converted some com.google.errorprone.annotations.CheckReturnValue annotations back to javax.annotation.CheckReturnValue, but there are others still using errorprone. Convert them all back to errorprone annotations to avoid unnecessary merge conflicts. Test: m checkbuild Change-Id: Ica26518e622ead18e4c45b4cbeec086597109e80
2019-01-16Add default code reviewers into OWNERS am: 3b8ab62042 am: 9f8f005620Chih-Hung Hsieh
am: 34d79c0477 Change-Id: Icc568353c3e86a32929ca172837dc41b1601b3b4
2019-01-16Add default code reviewers into OWNERS am: 3b8ab62042Chih-Hung Hsieh
am: 9f8f005620 Change-Id: I1ca1b697efc58486abf35cd8cd394b7f72e1670d
2019-01-16Add default code reviewers into OWNERSChih-Hung Hsieh
am: 3b8ab62042 Change-Id: I4abac5d8534c2b87941a0ec21e4e48f8f586b88a
2019-01-16Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I502a05f097b2a2cdfbdcf4594d971e1b77e892ca
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 01:39:23 +0000