aboutsummaryrefslogtreecommitdiff
path: root/java
Commit message (Collapse)AuthorAgeFilesLines
* Merge changes Ifa4594ea,Ia756f309Colin Cross2021-10-181-1/+1
|\ | | | | | | | | | | * changes: Reduce commands per shard for java protos Up per-product memory usage to 30 GB
| * Reduce commands per shard for java protosColin Cross2021-10-181-1/+1
| | | | | | | | | | | | | | | | `m platformprotos` with a long OUT_DIR can trigger E2BIG errors in posixspawn, reduce the commands per shard. Test: OUT_DIR=$PWD/really-long-out-directory m platformprotos Change-Id: Ifa4594eac7ba0e1091df0ef75e4dfc3ff366939b
* | Merge "Extract the logic of setting Uncompress_dex to a common place."Jiakai Zhang2021-10-151-15/+14
|\ \
| * | Extract the logic of setting Uncompress_dex to a common place.Jiakai Zhang2021-10-111-15/+14
| | | | | | | | | | | | | | | | | | Bug: 194150908 Test: m nothing Change-Id: Ia33965067586cfd48183e6d17f5d17626eef3c5a
* | | Add android_sdk_repo_host to build platform-tools&build-toolsDan Willemsen2021-10-133-11/+14
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | The Android SDK has been built with Make up until now, monolithically, then split up into several sdk-repo zip files for different purposes. The Mac and Windows SDKs really only need to contain the platform-tools and build-tools pieces, but due to this monolithic sdk zip, we had to build the whole SDK first. This adds an `android_sdk_repo_host` module that can build these platform-tools and build-tools zips. Bug: 187222815 Change-Id: I55809e1d7447dd65e22461f921b2b8abb6d5f822
* | Merge "Allow defaults in java_genrule modules"Steven Moreland2021-10-111-0/+2
|\ \
| * | Allow defaults in java_genrule modulesColin Cross2021-10-081-0/+2
| |/ | | | | | | | | | | | | | | | | Call InitDefaultableModule in java_genrule factories to allow the defaults property to be used. Bug: 202547639 Test: m checkbuild Change-Id: I3a5960304af3e9babb30d036d63016087000d773
* | Merge "Update reference to merged services txt"Anton Hansson2021-10-111-1/+1
|\ \ | |/ |/|
| * Update reference to merged services txtAnton Hansson2021-10-081-1/+1
| | | | | | | | | | | | | | | | The module is changing name. Update the reference. Bug: 169103987 Test: m Change-Id: I1e3f05b6d9c0262adcde6881ea79df9338bb363a
* | Merge "Merge Android 12"Xin Li2021-10-071-15/+80
|\ \
| * \ Merge "Allow implementation details to be excluded from signature patterns ↵Paul Duffin2021-10-062-4/+96
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | file" am: 6546573ec9 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1788094 Change-Id: I28f0ddcfe3746a8bf37471f9f1c9b9771fab690a
| * \ \ Retry: Separate hidden API flags needed in sdk snapshots for S and T am: ↵Paul Duffin2021-10-052-26/+59
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | 191be3a186 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1844294 Change-Id: Id8977b8160f175b736214428cae94ea27f95675b
| * | | Merge "Bp2Build common properties auto-handling" am: d905146590Treehugger Robot2021-10-041-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1815376 Change-Id: I38f1063302ea90583a51e625076e6232b4364ab7
| * \ \ \ Update variable name in error messages. am: e5b2b49a73Ulya Trafimovich2021-10-041-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1844308 Change-Id: Icb57f58d9efdf8793162254eefe8e3150d6d9cf5
| * \ \ \ \ Remove unnecessary additionalCheckedModules field am: 0b58fdb058Paul Duffin2021-10-042-24/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1842815 Change-Id: Ic6e55395138cfed7257529b2c5165bb4907460e1
| * \ \ \ \ \ Merge changes from topic "bb_201948713" am: 8bb9c6a1d9Salmax Chang2021-10-042-58/+25
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1844137 Change-Id: Ia042b5b24141be4ebfa17ab15adf34c3af632635
| * \ \ \ \ \ \ Merge "Separate hidden API flags needed in sdk snapshots for S and T" am: ↵Paul Duffin2021-10-022-25/+58
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b383e9ef2 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1835222 Change-Id: I092500dc977cc482a6c662ae9fcd4e71fea32810
| * \ \ \ \ \ \ \ Merge "Always perform permitted package check when building a library" am: ↵Paul Duffin2021-10-021-2/+17
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7db6ebaa1 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1842459 Change-Id: I8be5f7deb33b67b5307cb3a4551f659414a3aee9
| * \ \ \ \ \ \ \ \ Merge "Preopt APEX system server jars for java_import." am: 6f0c1a1e0cTreehugger Robot2021-10-021-1/+10
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1840056 Change-Id: Ifc6895e47d0e7e6ed7d593a9d5d767f6cd2cf566
| * \ \ \ \ \ \ \ \ \ Merge changes from topics "bp-bionic-cts-tests", ↵Colin Cross2021-10-013-6/+16
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "cts-per-testcase-directory" am: 2df9ebf9ca Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1838375 Change-Id: I9fd93be8154f2f1372ccde1eb9a37690738692b7
| * \ \ \ \ \ \ \ \ \ \ Merge changes I7876b077,Ib2e7d5e6,I7d2d2e02,Ibf5322f8 am: dcc42b6f7eJiakai Zhang2021-09-302-1/+147
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1835088 Change-Id: Ifefcf876e203406967f44c035495dbba49c4362f
| * \ \ \ \ \ \ \ \ \ \ \ Merge "Remove updatable-bcp-packages.txt." am: a14b18fb31Jiakai Zhang2021-09-264-45/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832483 Change-Id: If17f9cb0d0cef77ea2d2fc3f0ddac177f449daca
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add phony name for robolectric tests" am: ffe2c918e9Colin Cross2021-09-241-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1831866 Change-Id: I94f283455b3ddecad3d932d7bdbdab902ff211ee
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge changes I957f3df8,I68986dcc am: cf6bf37d04Martin Stjernholm2021-09-2410-120/+172
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829372 Change-Id: Ifcf471f2746c1037b83c2a11b8f5120b86fd6cb2
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Changes tree built Robolectric name" into stage-aosp-masterTreeHugger Robot2021-09-231-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Changes tree built Robolectric nameJoseph Murphy2021-09-231-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: b/194219998 Test: locally ran all in-tree Robolectric tests Change-Id: If13583f6a2882e2e78d3004afc476debf6692df9 Merged-In: If13583f6a2882e2e78d3004afc476debf6692df9
| * | | | | | | | | | | | | | | | Merge "Add annotations.zip support to java_sdk_library" am: 86da9c6a3dAnton Hansson2021-09-234-5/+63
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832255 Change-Id: Id5625d0cc95fa1d235ee5eed6c008b9f555f876b
| * | | | | | | | | | | | | | | | Merge "Add java_binary_host support for Windows" am: b13daf2ba7Dan Willemsen2021-09-221-3/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832212 Change-Id: I689e0da48cde43581890a8f46e185825a9984035
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Remove workaround for modules with missing BCP fragments, as they are ↵Treehugger Robot2021-09-221-7/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | present now." am: cd439a27e4 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1828596 Change-Id: I81f0280f4ef5082fb80d4d906fa766b7fb78a296
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add back the api_srcs argument" am: 8b1add6dd4Anton Hansson2021-09-211-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830032 Change-Id: I1dd0b451e8d195e7f382b649aedadebb804a429f
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Enable compose kotlinc plugin when depending on the compose runtime" ↵Aurimas Liutikas2021-09-205-0/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e992a52d0e Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830673 Change-Id: I8becfa1da6f0b03d0fd839b5e60b6a5f9c662821
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add support for d8 --main-dex-rules" am: 80bb3164b9Colin Cross2021-09-201-4/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829133 Change-Id: Ib105939a0e11dae97b40cf003c75808ee1d879ec
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add test to TestJavaStableSdkVersion for legacy core platform" am: ↵Treehugger Robot2021-09-203-7/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3769a27c5e Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655611 Change-Id: I752f24a2e6b9763019866402a8af6adb3e96ee2a
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge changes I9c94a54a,Idc0c73a7 am: 2c6ede11ccJiakai Zhang2021-09-173-4/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1824513 Change-Id: I1f3ce39cd3b3988e676791a59f0c70e2bc80015d
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Revert^2 "Preopt APEX system server jars."" am: c9f9d56ed4Jiakai Zhang2021-09-175-29/+421
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1828115 Change-Id: I2a991341934af96455f136cbe44ef824f5e3e7f5
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Remove fallback code path for missing BCP fragments that is no longer ↵Martin Stjernholm2021-09-161-9/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | necessary." am: 33ce5d6c0e Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1821658 Change-Id: I145f398e8b22cca8e9e91a62d83cbb2014032261
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Prevent systemserverclasspath_fragment from depending on prebuilts" ↵Treehugger Robot2021-09-161-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a66a9f1a14 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1818248 Change-Id: I49ac420f4fc5b9220d1ff57b6c55a6a9d271c5d0
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Revert "Preopt APEX system server jars."" am: 79839d94c1Adrian Roos2021-09-155-421/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1827535 Change-Id: I2281010a93a89b69b859272627c7eac0d7e6d3ed
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Rename SdkMemberTypeDependencyTag to SdkMemberDependencyTag" am: ↵Paul Duffin2021-09-152-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c2c7f3e49b Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826225 Change-Id: I304997b8488094a28ef8b75baaf0d9c4341b1512
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Preopt APEX system server jars. am: ca9bc98e0cJiakai Zhang2021-09-155-29/+421
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1821984 Change-Id: If42b905c0636b10881b372efafd3e2f9bc84923c
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix panic when a module has an invalid output path" am: cf6749630aTreehugger Robot2021-09-151-10/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826960 Change-Id: I972bbb9b99121e1ee4ffb33c0278f239dd61db8f
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add {.aar} support for android_library" am: db3ff57368Treehugger Robot2021-09-151-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826617 Change-Id: I2404648a8bdea49d13f2c747a75b82002ee172b5
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge changes I4e7aa1a3,Ic0cd2411 am: 2e380e7971Ulyana Trafimovich2021-09-022-3/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1815791 Change-Id: Ie2a5d819d9e9e76a349c6b2e576e09b4c4551895
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Refactor SdkMemberType.AddDependencies()" am: a36ffdead5Treehugger Robot2021-08-315-12/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1808897 Change-Id: I0535c811329b9101059bf9a8953ee203335d2cb4
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Skip dexbootjar check using AllowMissingDependencies flag" am: b7e5985fd5Spandan Das2021-08-311-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1803934 Change-Id: I55ae4c5858330385876eb42e0fa16773ca748150
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/soong" am: cc1990f564Treehugger Robot2021-08-271-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1811859 Change-Id: I1f14f7e37557af3be87f8c322fc02d433cb79b4a
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Rename BuildDir and NinjaBuildDir." am: 5602d33025Lukács T. Berki2021-08-273-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1810356 Change-Id: I6af3316fb122af7a05b71de7f9cd371746bb5f21
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Make sure that classpath fragment contents appear in make vars." am: ↵satayev2021-08-242-2/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 28e5eda261 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1740313 Change-Id: I216856a16603567c623114d3b5b42506e9dc89b2
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Don't add `uses_libs`/`optional_uses_libs` to the manifest_fixer." ↵Ulyana Trafimovich2021-08-245-32/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 81a1adb6db Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1803744 Change-Id: Id5c9f8a14ddd00eaedde4d404d4773fc2c214c1a
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Propagate <uses-library> dependencies from `java_library` to apps." ↵Ulyana Trafimovich2021-08-193-5/+63
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: abcce6f1c3 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1799761 Change-Id: Ie123fec13c88ec20e79d9e688f31468764ab01d5