Commit Graph

76088 Commits

Author SHA1 Message Date
Treehugger Robot
5b8fce525a Merge "android_app APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE" into main am: 8763530dff am: 040d3deedb am: 278c9d0636 am: 6a492430c9 am: 6d5c3d9e73
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2718294

Change-Id: I61823bfe4ac6e6f037a1d26012301bd3efba470d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 21:26:15 +00:00
Spandan Das
75909010f7 Merge "Fix bp2build's stub/impl selection logic for platform variants" into main am: ea9a510c5c am: afab110223 am: 7e73897828 am: 0d7fd7d720 am: bce6099396
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744713

Change-Id: I7142b7dd9b44aba70ddbd2953bca89457b8564f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 21:25:29 +00:00
Cole Faust
33ae6e9b0f Merge "Revert^2 "Only allow setting presigned without preprocessed on targetSdk < 30"" into main am: 1b365e350a am: 70f839fe01 am: ee8bcdb34d am: abdcb6841a am: 066c7a930c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744898

Change-Id: Iba0b20b73129a4bc778ce2c8da50b93a961684c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 21:24:43 +00:00
Cole Faust
b523e0ce21 Merge "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main am: 72d5c104b8 am: dda155301a am: ccc530da10 am: e6f0686f7f am: 04ccd0bcd5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741125

Change-Id: I54358723586cb449d3d34ae0f8bd65abac3b366f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 21:22:05 +00:00
Treehugger Robot
6d5c3d9e73 Merge "android_app APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE" into main am: 8763530dff am: 040d3deedb am: 278c9d0636 am: 6a492430c9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2718294

Change-Id: I2073102bcd92c125e2f3b1f07f596b9d024d8081
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 20:26:09 +00:00
Spandan Das
bce6099396 Merge "Fix bp2build's stub/impl selection logic for platform variants" into main am: ea9a510c5c am: afab110223 am: 7e73897828 am: 0d7fd7d720
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744713

Change-Id: I3b493d1cf58809e3fcbc3c13df86eb54c555b1c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 20:25:43 +00:00
Cole Faust
066c7a930c Merge "Revert^2 "Only allow setting presigned without preprocessed on targetSdk < 30"" into main am: 1b365e350a am: 70f839fe01 am: ee8bcdb34d am: abdcb6841a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744898

Change-Id: If92c3185a584693e87ecd1777964d9782d55d1cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 20:25:04 +00:00
Cole Faust
04ccd0bcd5 Merge "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main am: 72d5c104b8 am: dda155301a am: ccc530da10 am: e6f0686f7f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741125

Change-Id: I855e12016f221ccecd853864184fcf6a2fec7a1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 20:23:29 +00:00
Treehugger Robot
6a492430c9 Merge "android_app APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE" into main am: 8763530dff am: 040d3deedb am: 278c9d0636
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2718294

Change-Id: I11dd2f173ad08a7cf9efb2e040aa8cbb5084920f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 19:49:59 +00:00
Spandan Das
0d7fd7d720 Merge "Fix bp2build's stub/impl selection logic for platform variants" into main am: ea9a510c5c am: afab110223 am: 7e73897828
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744713

Change-Id: I61bff5f32032fc2cabf6df4cef7feced5b8f6263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 19:49:48 +00:00
Cole Faust
abdcb6841a Merge "Revert^2 "Only allow setting presigned without preprocessed on targetSdk < 30"" into main am: 1b365e350a am: 70f839fe01 am: ee8bcdb34d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744898

Change-Id: I38aaf94939184851c256dfce73ca5444301ba82c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 19:49:25 +00:00
Cole Faust
e6f0686f7f Merge "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main am: 72d5c104b8 am: dda155301a am: ccc530da10
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741125

Change-Id: Iec916f8d57d3b1fed02e4a0d6c5312abcc9f94a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 19:47:48 +00:00
Treehugger Robot
278c9d0636 Merge "android_app APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE" into main am: 8763530dff am: 040d3deedb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2718294

Change-Id: I9eb8c42cd6bc1cf7deb7626e7b84519527f4a44d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 18:10:50 +00:00
Spandan Das
7e73897828 Merge "Fix bp2build's stub/impl selection logic for platform variants" into main am: ea9a510c5c am: afab110223
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744713

Change-Id: I7b6626280cf36210ab0ee6083c1729d4d2b0fa28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 18:10:16 +00:00
Cole Faust
ee8bcdb34d Merge "Revert^2 "Only allow setting presigned without preprocessed on targetSdk < 30"" into main am: 1b365e350a am: 70f839fe01
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744898

Change-Id: Ib55b1b9ff7e88f9985e61b5b40305e74aaa67423
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 18:10:05 +00:00
Cole Faust
ccc530da10 Merge "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main am: 72d5c104b8 am: dda155301a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741125

Change-Id: I4a78c5b9583b127bc760b78ceb14966504a1802f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 18:09:31 +00:00
Paul Duffin
ff8d25f99e Merge "Convert Android.bp files in sub-directories of tools/metalava" into main am: 7d885d53a6 am: 88c4600387 am: 7fd22409a8 am: a407ffba4b am: 6ded96a3d3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744734

Change-Id: I45d2f1c9b3bd8e1cdb7afa5ad8862903bceee696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 18:06:05 +00:00
Treehugger Robot
040d3deedb Merge "android_app APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE" into main am: 8763530dff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2718294

Change-Id: I4d70528e0eda3cdf229c64ddb8cc99eb119015d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 17:20:02 +00:00
Spandan Das
afab110223 Merge "Fix bp2build's stub/impl selection logic for platform variants" into main am: ea9a510c5c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744713

Change-Id: I986109e4d38ae4478a70ee464b4e42546108170a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 17:19:35 +00:00
Cole Faust
70f839fe01 Merge "Revert^2 "Only allow setting presigned without preprocessed on targetSdk < 30"" into main am: 1b365e350a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744898

Change-Id: I6472d8ab1c2fbc221f04f6c63cb6be77d38688fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 17:19:06 +00:00
Cole Faust
dda155301a Merge "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main am: 72d5c104b8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741125

Change-Id: I5d06ff9913fdf092020f2f598328b783bf343a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 17:18:12 +00:00
Paul Duffin
6ded96a3d3 Merge "Convert Android.bp files in sub-directories of tools/metalava" into main am: 7d885d53a6 am: 88c4600387 am: 7fd22409a8 am: a407ffba4b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744734

Change-Id: Ief501b198193126b1b200d2c1e499b1f04657b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 17:09:19 +00:00
Treehugger Robot
8763530dff Merge "android_app APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE" into main 2023-09-07 16:55:45 +00:00
Spandan Das
ea9a510c5c Merge "Fix bp2build's stub/impl selection logic for platform variants" into main 2023-09-07 16:55:43 +00:00
Cole Faust
1b365e350a Merge "Revert^2 "Only allow setting presigned without preprocessed on targetSdk < 30"" into main 2023-09-07 16:42:08 +00:00
Cole Faust
72d5c104b8 Merge "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main 2023-09-07 16:41:45 +00:00
Paul Duffin
a407ffba4b Merge "Convert Android.bp files in sub-directories of tools/metalava" into main am: 7d885d53a6 am: 88c4600387 am: 7fd22409a8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744734

Change-Id: Ifd52571f38dd60f609faab055b4918e7f805c6f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 16:33:08 +00:00
Treehugger Robot
b22cd6bce3 Merge "Modify static lib stub library visiblity" into main am: 968c735108 am: f7fc893c2a am: 86633be948 am: 613e513864 am: 444346dce5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744913

Change-Id: Icf9d977da869285d2dce8479a0e11a8677424fe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 16:30:28 +00:00
Treehugger Robot
3fc2a3c37f [automerger skipped] Merge changes I3ab20b76,I08e69319 into udc-mainline-prod am: a4158239a5 -s ours
am skip reason: Merged-In I3ab20b76a60cab66a27784b7d87a069813d19835 with SHA-1 f8aaaa13f4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24691974

Change-Id: I3d7696aae5f14b1c364d2d74e22bf4a11e5cfcd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 15:49:01 +00:00
Paul Duffin
3dc9caa661 [automerger skipped] Replace -bootclasspath and -classpath metalava options with --classpath am: a6d2ecd2ff -s ours
am skip reason: Merged-In I3ab20b76a60cab66a27784b7d87a069813d19835 with SHA-1 f8aaaa13f4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24691974

Change-Id: I694823181e82970aa6aa022d88544b3d2945e65b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 15:48:57 +00:00
Paul Duffin
9fe6ca66b0 Convert Android.bp files in sub-directories of tools/metalava am: cba810e0ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24691972

Change-Id: I4bdfa841dabb867cafdb2af033b86a896eed5711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 15:47:53 +00:00
Paul Duffin
7fd22409a8 Merge "Convert Android.bp files in sub-directories of tools/metalava" into main am: 7d885d53a6 am: 88c4600387
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744734

Change-Id: I7b98882806b0833ae1abf0d1ee0044a13f598d9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 15:47:02 +00:00
Treehugger Robot
444346dce5 Merge "Modify static lib stub library visiblity" into main am: 968c735108 am: f7fc893c2a am: 86633be948 am: 613e513864
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744913

Change-Id: Ic2908c281a6550ca26240b1856e4cfc0dbc67f3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 15:34:31 +00:00
Treehugger Robot
a4158239a5 Merge changes I3ab20b76,I08e69319 into udc-mainline-prod
* changes:
  Replace -bootclasspath and -classpath metalava options with --classpath
  Stop using single-hyphen metalava options
2023-09-07 15:10:39 +00:00
Treehugger Robot
613e513864 Merge "Modify static lib stub library visiblity" into main am: 968c735108 am: f7fc893c2a am: 86633be948
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744913

Change-Id: I0f734e31e2718501b413fe729a7dc6ee13b3c723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 14:53:09 +00:00
Paul Duffin
88c4600387 Merge "Convert Android.bp files in sub-directories of tools/metalava" into main am: 7d885d53a6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744734

Change-Id: I2fc086db8e735982e3d7d3a9fc3c114f94cb6268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 14:49:52 +00:00
Treehugger Robot
86633be948 Merge "Modify static lib stub library visiblity" into main am: 968c735108 am: f7fc893c2a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744913

Change-Id: I2a9e372c57bc02780d456bb98ceb1966cf90392b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 14:06:14 +00:00
Yi Kong
de5eaed594 Update rust bindgen to clang-r498229b am: 06521c4f46 am: dffe7efbea am: c37e18b195 am: 61eb32aef0 am: f9b9c1627d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744954

Change-Id: I6524f8e63b7dc7153e5c653f3f782fc0b7677c32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 14:03:38 +00:00
Paul Duffin
7d885d53a6 Merge "Convert Android.bp files in sub-directories of tools/metalava" into main 2023-09-07 13:55:40 +00:00
Paul Duffin
a6d2ecd2ff Replace -bootclasspath and -classpath metalava options with --classpath
Metalava has not differentiated between bootclasspath and classpath for
years so this change replaces the use of the two deprecated single
hyphen options with `--classpath`.

Bug: 295136054
Test: m checkapi
(cherry picked from https://android-review.googlesource.com/q/commit:f8aaaa13f4fb87cc0f7bd5231f2334499d174109)
Merged-In: I3ab20b76a60cab66a27784b7d87a069813d19835
Change-Id: I3ab20b76a60cab66a27784b7d87a069813d19835
2023-09-07 13:50:05 +00:00
Paul Duffin
bff6432d7c Stop using single-hyphen metalava options
`-encoding` and `-source` have been deprecated in metalava.

`-encoding` actually does nothing apart from check to make sure that
the value is `utf-8` (in some case). Metalava always uses `utf-8`.

`-source` has been deprecated in favor of `--java-source` as metalava
also can consume kotlin and it has its own `--kotlin-source` option.

Bug: 295136054
Test: ./gradlew
(cherry picked from https://android-review.googlesource.com/q/commit:808211e519ae43517ae7d6ed5348ffb1e3b63c45)
Merged-In: I08e6931958f40022d65d417360e32b72a1d70444
Change-Id: I08e6931958f40022d65d417360e32b72a1d70444
2023-09-07 13:49:44 +00:00
Treehugger Robot
f7fc893c2a Merge "Modify static lib stub library visiblity" into main am: 968c735108
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744913

Change-Id: Idbe5d3ee533ceabb35172a586cd89ae567d16554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 13:14:13 +00:00
Yi Kong
f9b9c1627d Update rust bindgen to clang-r498229b am: 06521c4f46 am: dffe7efbea am: c37e18b195 am: 61eb32aef0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744954

Change-Id: I132907c00aa9336c8266409b51fb3546361634be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 13:06:34 +00:00
Paul Duffin
cba810e0ac Convert Android.bp files in sub-directories of tools/metalava
Bug: 299428102
Test: m checkapi
(cherry picked from https://android-review.googlesource.com/q/commit:85e33c1cade0af2a1f7cd82370985c29c5029aa1)
Merged-In: Ia01a394ec80e7d760cfb920993807c4006d8c36e
Change-Id: Ia01a394ec80e7d760cfb920993807c4006d8c36e
2023-09-07 12:48:13 +00:00
Yi Kong
61eb32aef0 Update rust bindgen to clang-r498229b am: 06521c4f46 am: dffe7efbea am: c37e18b195
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744954

Change-Id: I85359a2b8a9b6778b38b191f7135909dd7d071e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 12:28:32 +00:00
Treehugger Robot
968c735108 Merge "Modify static lib stub library visiblity" into main 2023-09-07 12:07:17 +00:00
Yi Kong
c37e18b195 Update rust bindgen to clang-r498229b am: 06521c4f46 am: dffe7efbea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744954

Change-Id: I30df433f1ba3ea04bfe7846680b5829e91c66799
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 11:42:21 +00:00
Paul Duffin
85e33c1cad Convert Android.bp files in sub-directories of tools/metalava
Bug: 299428102
Test: m checkapi
Change-Id: Ia01a394ec80e7d760cfb920993807c4006d8c36e
2023-09-07 12:08:53 +01:00
Yi Kong
dffe7efbea Update rust bindgen to clang-r498229b am: 06521c4f46
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744954

Change-Id: I48b49c60e345be9d2d2c18ab1076a968c40ff7e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 10:49:04 +00:00
Yi Kong
06521c4f46 Update rust bindgen to clang-r498229b
Bug: 293616148
Change-Id: I5102c5834a4f2f74242d57c9ec946d0b9381e893
Test: presubmit
2023-09-07 07:18:50 +00:00