Commit Graph

98051 Commits

Author SHA1 Message Date
Treehugger Robot
c148c22c7d Merge "Remove obsolete java compilation artifacts" into main am: a2357e90d7 am: babf92364c
Original change: https://android-review.googlesource.com/c/platform/build/+/3079346

Change-Id: I53a64d28cdd273681f0a868bd354fc5e66a26d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 23:10:55 +00:00
Treehugger Robot
babf92364c Merge "Remove obsolete java compilation artifacts" into main am: a2357e90d7
Original change: https://android-review.googlesource.com/c/platform/build/+/3079346

Change-Id: Ie7bf6ddbfa15d855c2c8ca184b9b2ac109f13945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 22:53:32 +00:00
Treehugger Robot
a2357e90d7 Merge "Remove obsolete java compilation artifacts" into main 2024-05-08 22:28:05 +00:00
Kelvin Zhang
c0ad9c98bd Merge "Revert "Fix retrofit OTA generation failures"" into main am: e41c75cb83 am: 094641230e
Original change: https://android-review.googlesource.com/c/platform/build/+/3079786

Change-Id: I68fe99bf478f81f4d085e330c8e74fdc95380324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 21:15:19 +00:00
Kelvin Zhang
094641230e Merge "Revert "Fix retrofit OTA generation failures"" into main am: e41c75cb83
Original change: https://android-review.googlesource.com/c/platform/build/+/3079786

Change-Id: I4412735014ebb52f7bee6a10c3f29a9a153d1ac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 21:00:30 +00:00
Kelvin Zhang
e41c75cb83 Merge "Revert "Fix retrofit OTA generation failures"" into main 2024-05-08 20:37:41 +00:00
Kelvin Zhang
681597df18 Revert "Fix retrofit OTA generation failures"
This reverts commit 7af14aa7da.

Reason for revert: b/339483257

Change-Id: I86cf6c0baed8697ace888135b3d66b4785d22aa5
2024-05-08 20:10:22 +00:00
LaMont Jones
afd245c3f6 [automerger skipped] Enable build flags in protobuf am: 69b2ed6610 -s ours
am skip reason: Merged-In I1d84db76b157082fc7db1b3cb7c9afe8cdf46cbf with SHA-1 20dd4c2360 is already in history

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

Change-Id: I2f4120c52553c823da719b22fa640a878c1c6f08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 19:54:14 +00:00
LaMont Jones
e70abe3a3d [automerger skipped] Do not use build/trunk_release/release_config_map.mk am: afd6a265a9 -s ours
am skip reason: Merged-In I0ef2a900568daccfbd2ef1d8949674e6f2a63e00 with SHA-1 91fa4323c8 is already in history

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

Change-Id: I99ff2487abe59bdb950b7a45bfe92e6047d7c89d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 19:54:10 +00:00
LaMont Jones
212d55b489 [automerger skipped] Defer "no such release config" error am: 08924a47a4 -s ours
am skip reason: Merged-In I862f167062ee647af00a4ec7d4af2966c6be44a8 with SHA-1 76452d8b40 is already in history

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

Change-Id: I7818ee096db2840934cc7443bc9cbd6093888f3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 19:54:08 +00:00
LaMont Jones
1797ba1381 [automerger skipped] Allow duplicate release config maps and build flag declarations am: 7dd547294d -s ours
am skip reason: Merged-In I18316e769438f62071723771762d6e89be98b813 with SHA-1 ff11fd70d7 is already in history

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

Change-Id: I5d22772505d52b39ea7dbac7dcdec116320bd072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 19:54:05 +00:00
LaMont Jones
970a703b22 [automerger skipped] Look for release_config_map.mk in more projects am: b5e3f0c2d2 -s ours
am skip reason: Merged-In If810780de164b74c3e3ebc35260384843de2c084 with SHA-1 318dafeca0 is already in history

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

Change-Id: Idd042b11061e9a210545126dac3bedcbf0a1dc17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 19:54:02 +00:00
Dennis Shen
7ef182e7a3 Merge "aconfig: make MutableMappedStorageFiles inherit MappedStoargeFiles" into main am: 015de62d7a am: 3807c32bff
Original change: https://android-review.googlesource.com/c/platform/build/+/3077003

Change-Id: Ic6a19eea0269b2e38d2678321a310d4d36599b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 19:40:34 +00:00
Dennis Shen
3807c32bff Merge "aconfig: make MutableMappedStorageFiles inherit MappedStoargeFiles" into main am: 015de62d7a
Original change: https://android-review.googlesource.com/c/platform/build/+/3077003

Change-Id: I1061ef4129c236572f51b89e3596f805e86ea3de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 19:23:02 +00:00
Dennis Shen
015de62d7a Merge "aconfig: make MutableMappedStorageFiles inherit MappedStoargeFiles" into main 2024-05-08 18:55:00 +00:00
Treehugger Robot
a415659b3a Merge "Fix retrofit OTA generation failures" into main am: 9a78be4d42 am: 0ea0bb5249
Original change: https://android-review.googlesource.com/c/platform/build/+/3079783

Change-Id: Ic93586ef7fb3b507d5697c634bd527e960824fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 18:24:46 +00:00
Treehugger Robot
0ea0bb5249 Merge "Fix retrofit OTA generation failures" into main am: 9a78be4d42
Original change: https://android-review.googlesource.com/c/platform/build/+/3079783

Change-Id: I5696ce46f677bad2a9b1a5c182a7e84d2f814d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 17:59:09 +00:00
Jihoon Kang
b09bead297 Remove obsolete java compilation artifacts
Please note that this is an addition on top of  https://r.android.com/3078030.

Test: TH
Bug: 332785297
Change-Id: I1ee21398c72d8ee152e569626868eea3716af1bd
2024-05-08 17:52:52 +00:00
Treehugger Robot
9a78be4d42 Merge "Fix retrofit OTA generation failures" into main 2024-05-08 17:35:43 +00:00
Kelvin Zhang
7af14aa7da Fix retrofit OTA generation failures
retrofit OTA generation relies on files in OTA/* , include these
files when copying target_files dir to tmp location.

Test: th
Bug: 337043530
Fixes: 337043530
Change-Id: I8fd7729bc1b2d2797f7e76f594b06fd9675fa104
2024-05-08 09:28:40 -07:00
Treehugger Robot
1a7a53388b Merge "Add the step to generate LLNDK ABI dumps" into main 2024-05-08 06:20:44 +00:00
Wei Li
599c1d3082 Merge "Add license metadata declarations which are moved from device/google/redfin/Android.mk." into main am: 32b652fd68 am: 25974b6f62
Original change: https://android-review.googlesource.com/c/platform/build/+/3078028

Change-Id: Ic82c8426e838989708199334ad0094489724f80a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 04:38:25 +00:00
Wei Li
25974b6f62 Merge "Add license metadata declarations which are moved from device/google/redfin/Android.mk." into main am: 32b652fd68
Original change: https://android-review.googlesource.com/c/platform/build/+/3078028

Change-Id: I296682f020d5c8c8d547cff694060f9af48ca5aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 04:11:45 +00:00
Wei Li
32b652fd68 Merge "Add license metadata declarations which are moved from device/google/redfin/Android.mk." into main 2024-05-08 03:55:58 +00:00
Treehugger Robot
d46573acc9 Merge "Revert^2 "Remove obsolete java compilation artifacts"" into main am: 291bcf4f37 am: 6e3350dbd7
Original change: https://android-review.googlesource.com/c/platform/build/+/3078030

Change-Id: Id86b7744c9190c6be5e8e63c978df203522d4a85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 03:32:57 +00:00
Treehugger Robot
6e3350dbd7 Merge "Revert^2 "Remove obsolete java compilation artifacts"" into main am: 291bcf4f37
Original change: https://android-review.googlesource.com/c/platform/build/+/3078030

Change-Id: Ifd11e0bfeeae4a407747275b9e73a615e50a003f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 03:15:30 +00:00
Treehugger Robot
291bcf4f37 Merge "Revert^2 "Remove obsolete java compilation artifacts"" into main 2024-05-08 02:41:09 +00:00
Jihoon Kang
d01ea714e2 Revert^2 "Remove obsolete java compilation artifacts"
This reverts commit 132fceec4c.

Reason for revert: CleanSpec.mk files are not meant to be reverted.

Change-Id: I72ad8d1b610f67525c905634f77b4d12849dbe30
2024-05-08 01:01:12 +00:00
Treehugger Robot
452f614749 Merge "Update BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE documentation" into main am: 5b99bc00a0 am: e0b7bb7ebb
Original change: https://android-review.googlesource.com/c/platform/build/+/3077369

Change-Id: I536799206b4c97c6676da450bec5ad8513629013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 00:36:47 +00:00
Treehugger Robot
2cb488710a Merge "Remove the ANDROID_ENABLE_TOOL_LOGGING environment variable" into main am: 2bab653d64 am: e20a49ff62
Original change: https://android-review.googlesource.com/c/platform/build/+/3078026

Change-Id: I880d6a2c2334dbcdaaf2f44f9db2cd603b80c372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 00:35:08 +00:00
Treehugger Robot
e0b7bb7ebb Merge "Update BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE documentation" into main am: 5b99bc00a0
Original change: https://android-review.googlesource.com/c/platform/build/+/3077369

Change-Id: I71434fab1ddf3ef96cec70c36fb1af646f80bcc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 00:20:04 +00:00
Treehugger Robot
e20a49ff62 Merge "Remove the ANDROID_ENABLE_TOOL_LOGGING environment variable" into main am: 2bab653d64
Original change: https://android-review.googlesource.com/c/platform/build/+/3078026

Change-Id: I647369e4115f9828c10c5bb77250b628ac2492e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-08 00:19:25 +00:00
Treehugger Robot
5b99bc00a0 Merge "Update BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE documentation" into main 2024-05-08 00:03:03 +00:00
Treehugger Robot
2bab653d64 Merge "Remove the ANDROID_ENABLE_TOOL_LOGGING environment variable" into main 2024-05-07 23:55:42 +00:00
Wei Li
93e946dfae Add license metadata declarations which are moved from device/google/redfin/Android.mk.
Bug: 311544087
Test: CIs
Change-Id: I3d98e813e998e35177e16c12ff5a5298f79a7fcc
2024-05-07 16:38:26 -07:00
Treehugger Robot
96edb85f0b Merge "Building mainline modules from source is now the default" into main am: cf7dd64339 am: 77968e3779
Original change: https://android-review.googlesource.com/c/platform/build/+/3073489

Change-Id: I7fca31161ffa412e99ca67ff2faf6bc9d745980a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 23:04:31 +00:00
Spandan Das
e4a3e9ee5a Update BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE documentation
With trunk stable, we no longer have multiple development branches, and
this flag is no longer in use.

Test: N/A (documentation change)
Bug: 308188056
Change-Id: Icdaddde9d107de9a453106cae35645b7e6cc21e9
2024-05-07 22:56:45 +00:00
Zhuoyao Zhang
ef1c03f997 Remove the ANDROID_ENABLE_TOOL_LOGGING environment variable
Reduce the number of variables required to toggle logging. This simplifies configuration and usage.

Test: atest run_tool_with_logging_test
Bug: 331638854
Change-Id: I6f2a820b59a0d1f45aba9ffb3e33e7ace601e9c6
2024-05-07 22:51:51 +00:00
Treehugger Robot
77968e3779 Merge "Building mainline modules from source is now the default" into main am: cf7dd64339
Original change: https://android-review.googlesource.com/c/platform/build/+/3073489

Change-Id: I92a18ef6c8a719e0760cdf50133b5c1d7c160fc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 22:43:42 +00:00
Treehugger Robot
cf7dd64339 Merge "Building mainline modules from source is now the default" into main 2024-05-07 22:25:02 +00:00
Steven Moreland
9fa12133ea Merge "16k: Enable 16k ELF alignment on all mainline modules" into main am: 43b6834425 am: b3e3c3d26c
Original change: https://android-review.googlesource.com/c/platform/build/+/3075963

Change-Id: I80cfe17e956212ddc32de318e39a632cba91b1a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 21:53:32 +00:00
Steven Moreland
b3e3c3d26c Merge "16k: Enable 16k ELF alignment on all mainline modules" into main am: 43b6834425
Original change: https://android-review.googlesource.com/c/platform/build/+/3075963

Change-Id: I0a6011cc34c556aa61b94ada3b0af43d6212f037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 21:42:53 +00:00
Steven Moreland
43b6834425 Merge "16k: Enable 16k ELF alignment on all mainline modules" into main 2024-05-07 21:17:27 +00:00
Dennis Shen
d772eb3edc aconfig: make MutableMappedStorageFiles inherit MappedStoargeFiles
Bug: b/321077378
Test: atest -c
Change-Id: Ib052df74bf79b5bc2a0f8c793701e3ff18f4aa30
2024-05-07 15:28:09 +00:00
Treehugger Robot
c00b07cd94 Merge "check-flagged-apis: consider superclasses when looking up symbol" into main am: 64dac049a6 am: 4b7f6e5c87
Original change: https://android-review.googlesource.com/c/platform/build/+/3075497

Change-Id: Ie775099d3477d762e2c36e631ed49215562df9a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 14:27:50 +00:00
Treehugger Robot
4b7f6e5c87 Merge "check-flagged-apis: consider superclasses when looking up symbol" into main am: 64dac049a6
Original change: https://android-review.googlesource.com/c/platform/build/+/3075497

Change-Id: Ie153f49524170ee92663080cfe3d003624ec5072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 14:21:17 +00:00
Dennis Shen
49e6cbeff4 Merge "aconfig: update storage file mapping api" into main am: 260663ddfc am: d557389eb1
Original change: https://android-review.googlesource.com/c/platform/build/+/3075404

Change-Id: I7e768b8e31ff2f68f606aadc83d25529156b4509
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 14:21:05 +00:00
Mårten Kongstad
0943171c52 Merge "check-flagged-apis: record super class when parsing classes" into main am: 5413a1e55d am: a7ddcf32bc
Original change: https://android-review.googlesource.com/c/platform/build/+/3075496

Change-Id: Iaeaccc57a9ed2430a487ace513ce1468094b3cca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 14:20:51 +00:00
Treehugger Robot
c38f3c0ebc Merge changes Ia6dfcfa8,I8d93c230,I4db7ff47,I003535c7,I8c0619fa into main am: 4925954a79 am: 1947cceae4
Original change: https://android-review.googlesource.com/c/platform/build/+/3075227

Change-Id: I0331ed0e61db65a6a0153559e05700a5387135ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-07 14:20:39 +00:00
Treehugger Robot
64dac049a6 Merge "check-flagged-apis: consider superclasses when looking up symbol" into main 2024-05-07 14:18:20 +00:00