summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-05-04Automated rollback of commit f672a31b8b19baab95373e4f2f6d110aa8b8f0fb.corysmith
*** Reason for rollback *** Unclassified general breakages in tests. Rolling back for further investigation. *** Original change description *** Normalized the serialization proto to save space and allow greater versatility in storage. RELNOTES: None PiperOrigin-RevId: 186057879 GitOrigin-RevId: d18d3e2f83f9d582858a3edab7a450c60044028c Change-Id: I0d722e4139074466d491b4c8ffb75c6777010f51
2018-05-04Normalized the serialization proto to save space and allow greater ↵corysmith
versatility in storage. RELNOTES: None PiperOrigin-RevId: 186036607 GitOrigin-RevId: f672a31b8b19baab95373e4f2f6d110aa8b8f0fb Change-Id: I71aa7e424993ec32007389c78e1b4ae061787f56
2018-05-04Resolve the owner of interface.super calls to inherited default methods for ↵kmb
android desugaring RELNOTES: None. PiperOrigin-RevId: 185863194 GitOrigin-RevId: c8e8749adc7b98c272b2421569dc97a88d487771 Change-Id: I063c2caa4b38fff2f9111f9fc09c317a5b097834
2018-05-04Desugar fixes:kmb
- make Objects.requireNonNull and Long.compare rewrites compatible with --core_library - apply those and try-with-resources rewrites to generated companion classes RELNOTES: None. PiperOrigin-RevId: 185262256 GitOrigin-RevId: f13a7ef7c9eb7ce400ffbbaca0bdc7945172a332 Change-Id: I07a3e5877bc7de8cdade93a6748d511a7669cafe
2018-05-04Delete erroneous piece of desugar's renaming logickmb
RELNOTES: None. PiperOrigin-RevId: 185218745 GitOrigin-RevId: c3c5d9bc0e52362bf37129099ba3af1b06229501 Change-Id: I0f277a39360f1de651dd81f2af8490cb5ca695a8
2018-05-04Stub default methods as needed for core library desugaringkmb
RELNOTES: None PiperOrigin-RevId: 185082719 GitOrigin-RevId: aa79fd483daff0db9be274c33de109257f8a6804 Change-Id: I90cad779653c93f9917f69fe06daad2bbf919f65
2018-05-04Refactor the command line argument parser to use the latest API.cnsun
RELNOTES:none PiperOrigin-RevId: 185027580 GitOrigin-RevId: 5ac4d7ad1ef9685b04aa58d4dfa15a38a42573d8 Change-Id: Idb27e1c1be02a5b8e0e9702fabeb9366424826ef
2018-05-04Rename generated core classes during core library desugaringkmb
RELNOTES: None. PiperOrigin-RevId: 184915177 GitOrigin-RevId: 154317e1269b1925722754291a8c7181ccd005f6 Change-Id: I2974e07e3154ec481579cb191c48bc2f8d0af06f
2018-05-04Reflect renamed classes in desugar output file nameskmb
RELNOTES: None. PiperOrigin-RevId: 184869773 GitOrigin-RevId: 005affa263e01afecf913a18edf830670f09c5f3 Change-Id: Ic36dfcf021efdcc29540791af52fa9f19054c671
2018-05-04drop debug info when loading classes in desugar as a workaround for ↵kmb
https://bugs.openjdk.java.net/browse/JDK-8066981 RELNOTES: None. PiperOrigin-RevId: 184732576 GitOrigin-RevId: e85e280645f579ffd5511a41553e95713c80177d Change-Id: Ic2e2372810c649b0376183b011441e70f08d57d1
2018-05-04Basic tooling to desugar select core librarieskmb
RELNOTES: None. PiperOrigin-RevId: 184619885 GitOrigin-RevId: 1324318ea0fe60350c0a5179818fc1c97d4ec854 Change-Id: I2d9bc87180067959b618641a188d83a8d7c24b3b
2018-05-04Fix StreamResourceLeak errorLiam Miller-Cushon
Fixes #4414 Change-Id: If47d9b97a220ae9e9feec2996be1f7df6491e93b PiperOrigin-RevId: 181465165 GitOrigin-RevId: 65c13dd5a4c1b4b5a072f7680b8f1cf3c5079b52
2018-05-04Relax the assertion on the inferred resource type. Now we only require that thecnsun
resource type should have a (public) close() method. The old version requires the resource type implements AutoCloseable. When the classpath provided to Desugar has some problems, the resource type may not implement AutoCloseable, though it has the close() method. RELNOTES:n/a. PiperOrigin-RevId: 180950815 GitOrigin-RevId: 7bde688a21b781caa666fe2bebe4482cf987270b Change-Id: Id0a03911e12f903ce62fec72317a7dbc8d311287
2018-05-04Warn about config expansions as we do for other expansions.ccalvarin
If an expanded value overrides an explicit value, users who do not know the contents of the expansion may be surprised. We already warned about this for hard-coded expansions, and this is now applicable for --config expansions as well. This will only warn when a single-valued option has its value replaced. Options that accumulate multiple values in a list (e.g., --copt) will silently include both explicit and expanded values. RELNOTES: None. PiperOrigin-RevId: 179857526 GitOrigin-RevId: 0421d7d8566a6fbe35e17a1edc3ab4d622aa6c9e Change-Id: Ie028995d2c4cbb90614ea8094b662d1b6e319241
2018-05-04Remove wrapper options support.ccalvarin
RELNOTES: None. PiperOrigin-RevId: 179588174 GitOrigin-RevId: 16f1c19c2c4f68555bb23891e3a4da4d5ac4a68d Change-Id: I089b4b2e4c846682db552aa4c0e0905142e9278b
2017-12-20Snap for 4510491 from 301a69dfe6fbb59072b6c1af278ec31c10cbdf35 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: I69f45883c2b13bc38cdd03199706e1a35dbb0525
2017-12-19Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devColin Cross
9e1602fcb0 am: a715adced4 am: e481f8e66f Change-Id: I829b963e2150538b432e32951e5c4242780e56eb
2017-12-19Revert "Revert "Merge remote-tracking branch 'aosp/upstream-master' into ↵Colin Cross
desugar"" am: 0156e0d255 am: bbd7d2e2c3 am: 748b31ab42 Change-Id: I46987eedb6dbed2c4a52acd650991864de43916c
2017-12-19Merge remote-tracking branch 'aosp/upstream-master' into master am: 9e1602fcb0Colin Cross
am: a715adced4 Change-Id: I2337379346c5b63ac6b84faf21e7c5960822b4b9
2017-12-19Revert "Revert "Merge remote-tracking branch 'aosp/upstream-master' into ↵Colin Cross
desugar"" am: 0156e0d255 am: bbd7d2e2c3 Change-Id: I039388f5f5045e9385461c60efbca732f1bce254
2017-12-19Merge remote-tracking branch 'aosp/upstream-master' into masterColin Cross
am: 9e1602fcb0 Change-Id: I6000bcab321f9ad3be79f206530a1b926c99131e
2017-12-19Revert "Revert "Merge remote-tracking branch 'aosp/upstream-master' into ↵Colin Cross
desugar"" am: 0156e0d255 Change-Id: Id57705c5c50bcb4dd5754762216176b3de781cb6
2017-12-18Merge remote-tracking branch 'aosp/upstream-master' into masterandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7o-mr1-iot-preview-8o-mr1-iot-preview-7Colin Cross
* aosp/upstream-master: Automatic formatting cleanup of Android *.java files. Eagerly close directory content stream again when looking for dumped lambdas RELNOTES: None. reflect prefix in additional ClassReader methods for consistency with what happens during visit() RELNOTES: None. Bug: 70415451 Test: m checkbuild Change-Id: Ia4743853a34a9c0d315663959eac0dcd0fdb627b
2017-12-18Revert "Revert "Merge remote-tracking branch 'aosp/upstream-master' into ↵Colin Cross
desugar"" This reverts commit 67e182a0a1c1d59b5fa107a42ba3bacdc7255eba. Bug: 70415451 Test: m checkbuild Change-Id: I87e967894b53b0f18defc48868e4e3b8181ddd33
2017-12-18Automatic formatting cleanup of Android *.java files.jingwen
RELNOTES: None. PiperOrigin-RevId: 179425421 GitOrigin-RevId: 094caa508fa74081d861e9e8f8eb50934811bf65 Change-Id: I9019cbd3802e7d74c61cc9bb8af9a7ff9bc05e2c
2017-12-18Eagerly close directory content stream again when looking for dumped lambdaskmb
RELNOTES: None. PiperOrigin-RevId: 179245378 GitOrigin-RevId: dd6f8298529f05372d9c0c31eabf19f69d38b22e Change-Id: Iaf61b5eec2bc3f050a3aada9532e8bb3d03d723f
2017-12-18reflect prefix in additional ClassReader methods for consistency with what ↵kmb
happens during visit() RELNOTES: None. PiperOrigin-RevId: 179115377 GitOrigin-RevId: 02f05cbbcaf2f6748525bc53469689b92a4be936 Change-Id: I9704b3dbf3ab6f9bdfcda0a1c864ee7668240f76
2017-12-17Snap for 4507345 from a6689a4f087339e0be57cef2944181fce8a030cd to pi-releaseandroid-build-team Robot
Change-Id: I7586933deacf40ba25481c68237285f153c60d25
2017-12-15Revert "Merge remote-tracking branch 'aosp/upstream-master' into desugar" ↵Colin Cross
am: 67e182a0a1 am: d9074776c9 am: 4552d61047 Change-Id: I91c44faaf7898507b15835b32b7860fb448671c2
2017-12-15Revert "Merge remote-tracking branch 'aosp/upstream-master' into desugar" ↵Colin Cross
am: 67e182a0a1 am: d9074776c9 Change-Id: I75ef138192f82e91d1a3d27d47800af03fe1808b
2017-12-15Revert "Merge remote-tracking branch 'aosp/upstream-master' into desugar"Colin Cross
am: 67e182a0a1 Change-Id: I74aaa1a32094f8a2e8364d1334f68ade73566894
2017-12-15Revert "Merge remote-tracking branch 'aosp/upstream-master' into desugar"Colin Cross
This reverts commit 28068806fa84995d3bd0f9aa448058c1d55cce36. Reason for revert: Caused "Too many open files" errors. Bug: 70415451 Change-Id: I2186e7eb5dd1501fe1c1c9c2f1fb1f1b6df2cc24
2017-12-15Merge remote-tracking branch 'aosp/upstream-master' into desugar am: ↵Colin Cross
28068806fa am: 6b2f3e8f0f am: 970766bc54 Change-Id: I64daa5e6eb1809f2f67a49f78dbc491610d84eb5
2017-12-15Merge remote-tracking branch 'aosp/upstream-master' into desugar am: 28068806faColin Cross
am: 6b2f3e8f0f Change-Id: Ie9cb7954709cdb7388a3c6731a834797d4d38059
2017-12-15Merge remote-tracking branch 'aosp/upstream-master' into desugarColin Cross
am: 28068806fa Change-Id: I80f75b80ada6ee035fc2768b1831b2c122b37cdd
2017-12-14Merge remote-tracking branch 'aosp/upstream-master' into desugarColin Cross
* aosp/upstream-master: make desugar resilient to unrelated lambdas being dumped while it runs RELNOTES: None. Correct stack map frame computation. When visiting CHOP Frame (discarding n local local variables), the current implementation deletes n local slots, which is wrong when the local variable to delete is of type category 2. Bug: 70415451 Test: m checkbuild Change-Id: Iadc6396e3154261f6de83a725a3a16939253e1b1
2017-12-14make desugar resilient to unrelated lambdas being dumped while it runskmb
RELNOTES: None. PiperOrigin-RevId: 178952440 GitOrigin-RevId: 817b535d92ee7fdb4740e2a99505ab10d4b54a0d Change-Id: I1cffc3b930289b86c097414b5aba6a697e4d4e74
2017-12-14Correct stack map frame computation. When visiting CHOP Frame (discarding n ↵cnsun
local local variables), the current implementation deletes n local slots, which is wrong when the local variable to delete is of type category 2. This CL deletes local variables instead of local slots. Another change is using the Label objects to identify uninitialized values, instead of the offsets of labels, because the offsets of labels might not be computed. RELNOTES:n/a. PiperOrigin-RevId: 178762969 GitOrigin-RevId: 770b1779dfd4e673e1523bc7e6f1772d4f4dfc04 Change-Id: Ib1ae1a813a51649d5d9522bdf393f48e56432b66
2017-12-11Snap for 4496165 from 046121d63e0802abe591d348bfccea8782487b83 to pi-releaseandroid-build-team Robot
Change-Id: Iae7aba491232c2765c5a451fccf62bcabd63c409
2017-12-10Add MODULE_LICENSE_APACHE2 and NOTICE files am: 6174695ef9 am: b6420c30b5Colin Cross
am: e128c69f6c Change-Id: I6f3dfad801596be8b59d757361199231bd2ce397
2017-12-10Add MODULE_LICENSE_APACHE2 and NOTICE files am: 6174695ef9Colin Cross
am: b6420c30b5 Change-Id: I38f22dbfae7e12ef4d8cb6f88f2cd32e539be01d
2017-12-10Add MODULE_LICENSE_APACHE2 and NOTICE filesColin Cross
am: 6174695ef9 Change-Id: I2e3c41166686c3a581e6eca781f87284ea104929
2017-12-08Merge remote-tracking branch 'aosp/upstream-master' into desugar am: ↵Colin Cross
00ed747d46 am: e893545a77 am: c7db50bb3f Change-Id: I6ebf8d448345d5d491a7d159e64a78742932c779
2017-12-08Merge remote-tracking branch 'aosp/upstream-master' into desugar am: 00ed747d46Colin Cross
am: e893545a77 Change-Id: I27f8b386aab61d169e210fefa122c25dca437d81
2017-12-08Merge remote-tracking branch 'aosp/upstream-master' into desugarColin Cross
am: 00ed747d46 Change-Id: I7d6ad99a178a6ee94537b677402c2d09d9c57ac0
2017-12-07Add MODULE_LICENSE_APACHE2 and NOTICE filesColin Cross
Bug: 70348808 Test: none Change-Id: Ia1ddceee436ac0c8588b61721df1a872ad31d6b0
2017-12-06Merge remote-tracking branch 'aosp/upstream-master' into desugarColin Cross
* aosp/upstream-master: Improve exception message to output more information. RELNOTES:None. Remove static import of inner class InferredType's fields Automatic code cleanup. Let to push lambda arguments not only with *LOAD instructions but with SIPUSH and *CONST_*. Fix canonical option list for options that implicitly require options with allowMultiple=true Change config expansion application order, gated by startup flag --expand_configs_in_place. Specialize $closeResource(Throwable, AutoCloseable) so that desugared code does not depend on AutoCloseable, as it is not available before API 19. Fix EnclosingMethod attribute when moving interface methods to companion class RELNOTES: None. Cleanup stream use in canonical list of options. Remove unused LegacyParamsFilePreProcessor. Removed test cases from OptionsParserTest are implemented in ParamsFilePreProcessorTest, ShellQuotedParamsFilePreProcessorTest and UnquotedParamsFilePreProcessorTest. Switch on tracking of specific option priorities. Compute canonical list of options using OptionValueDescription's tracking of instances. Test: m checkbuild Change-Id: Idb762b0dabc9660d9116d1b976fb2f74aa7f5e09
2017-12-06Improve exception message to output more information.cnsun
RELNOTES:None. PiperOrigin-RevId: 177875613 GitOrigin-RevId: ddd5ac16aeffa6c4693c348f73e7365240b1abc5 Change-Id: Id8e000ab3d3ef7b35cfa008e5a84b130e0e79e57
2017-12-06Remove static import of inner class InferredType's fieldsccross
A few of the InferredType's fields were being static imported, but not all of them, and the use of the statically imported fields was inconsistent. Statically importing the inner class causes strange errors when building desugar in the Android platform build with OpenJDK8, but not OpenJDK9: external/desugar/java/com/google/devtools/build/android/desugar/BytecodeTypeInference.java:1015: error: cannot find symbol @AutoValue ^ symbol: class AutoValue location: class BytecodeTypeInference 1 error Remove the static imports to make the build work and to make the usage consistent. RELNOTES:None. PiperOrigin-RevId: 177875501 GitOrigin-RevId: b0fb55ad19e4751b61cbbf79ba60748b6e594100 Change-Id: I0c467abeeaac31fad138c7e2a90535740e68e8e9
2017-11-29Automatic code cleanup.cushon
PiperOrigin-RevId: 177261837 GitOrigin-RevId: 85d69f2397d7b54fa8b8c69b7bc9ec6d36cb1d49 Change-Id: Iab3521ac7d7a5c1340ba85fa036686a622f1065e