Commit Graph

95630 Commits

Author SHA1 Message Date
Treehugger Robot
0ecfef4423 Merge "Add the next release to Class2NonSdkList." into main am: 2f9162f1cb
Original change: https://android-review.googlesource.com/c/platform/build/+/2858125

Change-Id: I0add0815f0d50b5f9fd80234f9a2e8eaa9991a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 01:22:26 +00:00
Colin Cross
78c9696aea Merge "Simplify module-info.json by leaving out optional fields" into main am: 8bb8482755
Original change: https://android-review.googlesource.com/c/platform/build/+/2835094

Change-Id: Ica862ae2ab0e0433a1ce88589b835abe0e07173c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 01:09:23 +00:00
Treehugger Robot
2f9162f1cb Merge "Add the next release to Class2NonSdkList." into main 2023-12-05 00:56:20 +00:00
Colin Cross
8bb8482755 Merge "Simplify module-info.json by leaving out optional fields" into main 2023-12-05 00:28:46 +00:00
Liming Wu
291816f210 Merge "Revert "handheld_system: Use build flag for NFC stack inclusion"" into main 2023-12-04 23:49:57 +00:00
Liming Wu
bf8ff2944f Revert "handheld_system: Use build flag for NFC stack inclusion"
Revert submission 25531363-nfc_apex_reland_flags

Reason for revert: < Build Break: https://android-build.googleplex.com/builds/culprit-assistant/run/40f1ef34-1727-4106-abd0-f064d6d0f781>

Bug:  314799938

Reverted changes: /q/submissionid:25531363-nfc_apex_reland_flags

Change-Id: I4cbc4eb47837bbd3d52010c18479500def7da434
2023-12-04 23:16:08 +00:00
Alex Buynytskyy
48d64b886a Add the next release to Class2NonSdkList.
Fixes: 313893203
Test: step-1
Change-Id: I0f6ae822cd206df23a2ffd1dade78bb430006c5d
2023-12-04 23:15:43 +00:00
Treehugger Robot
33c9186a36 Merge "handheld_system: Use build flag for NFC stack inclusion" into main 2023-12-04 17:40:04 +00:00
Mark White
c442bca636 Merge "framework-minus-apex build should include framework-res" into main 2023-12-04 10:58:48 +00:00
Colin Cross
3b4c3838dd Merge "Don't install test data from Soong" into main am: 35ce86d65e am: 949199ec49 am: d8dfd26cd6
Original change: https://android-review.googlesource.com/c/platform/build/+/2835093

Change-Id: Ifba0f676bafc3e4431149f7534c3e4d3b77b1f0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 20:35:00 +00:00
Colin Cross
da5132860e Merge "Don't install test data from Soong" into main am: 35ce86d65e am: 373496e27d am: 1696314ba9
Original change: https://android-review.googlesource.com/c/platform/build/+/2835093

Change-Id: I6da12aceb199651d571e7ac1ee384eed17cc4af4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 20:31:22 +00:00
Colin Cross
d8dfd26cd6 Merge "Don't install test data from Soong" into main am: 35ce86d65e am: 949199ec49
Original change: https://android-review.googlesource.com/c/platform/build/+/2835093

Change-Id: I256db104436efffc78c271b40485432a75b0f246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 19:59:50 +00:00
Colin Cross
1696314ba9 Merge "Don't install test data from Soong" into main am: 35ce86d65e am: 373496e27d
Original change: https://android-review.googlesource.com/c/platform/build/+/2835093

Change-Id: I874290ba2d5fc797c844074cfcc068f7c110ac00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 19:57:02 +00:00
Roshan Pius
dfdfb0bea7 handheld_system: Use build flag for NFC stack inclusion
Will be used to switch from the current NFC APK to new NFC mainline module.

Bug: 303286040
Test: Compiles
Change-Id: If2d6d0248faabe19e173074aacbe5f960f026fb5
2023-12-01 19:37:05 +00:00
Colin Cross
949199ec49 Merge "Don't install test data from Soong" into main am: 35ce86d65e
Original change: https://android-review.googlesource.com/c/platform/build/+/2835093

Change-Id: I26e688258633549d6666bf96dc8aa3665a76bf69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 19:35:37 +00:00
Roshan Pius
76bdf4fee9 [automerger skipped] Merge "build(nfc): Create framework-nfc sdk library" into main am: 999d9a1924 am: d2f4f984cf -s ours am: bc01e6ebdb -s ours
am skip reason: Merged-In I4b9901d2b3924157caebad0d083c4beacbad9749 with SHA-1 58f0337f22 is already in history

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

Change-Id: I4d167ff272e0a96262dd2fd3f8be89451c084b32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 19:24:30 +00:00
Colin Cross
373496e27d Merge "Don't install test data from Soong" into main am: 35ce86d65e
Original change: https://android-review.googlesource.com/c/platform/build/+/2835093

Change-Id: Ic655eb1b7172fbf491942af84f1836c099e29440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 19:22:40 +00:00
Roshan Pius
fb0a01d091 [automerger skipped] Merge "build(nfc): Create framework-nfc sdk library" into main am: 999d9a1924 am: 0cf3c25189 am: b428d2b580 -s ours
am skip reason: Merged-In I4b9901d2b3924157caebad0d083c4beacbad9749 with SHA-1 1cbdc45437 is already in history

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

Change-Id: I582d978ef9c3de753010a60edb69cdf6d4eee69d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 19:21:49 +00:00
Colin Cross
35ce86d65e Merge "Don't install test data from Soong" into main 2023-12-01 18:56:01 +00:00
Roshan Pius
bc01e6ebdb [automerger skipped] Merge "build(nfc): Create framework-nfc sdk library" into main am: 999d9a1924 am: d2f4f984cf -s ours
am skip reason: Merged-In I4b9901d2b3924157caebad0d083c4beacbad9749 with SHA-1 58f0337f22 is already in history

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

Change-Id: Ie155f7c9768c51fdecbf5d00f3a721b8f7bad1fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 18:49:18 +00:00
Roshan Pius
b428d2b580 Merge "build(nfc): Create framework-nfc sdk library" into main am: 999d9a1924 am: 0cf3c25189
Original change: https://android-review.googlesource.com/c/platform/build/+/2828697

Change-Id: I7e73e323708527297466eacc4404457432304fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 18:33:49 +00:00
Roshan Pius
d2f4f984cf Merge "build(nfc): Create framework-nfc sdk library" into main am: 999d9a1924
Original change: https://android-review.googlesource.com/c/platform/build/+/2828697

Change-Id: Ie716fe1916adb2dc42045eeef84b8cc16d2aac20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 18:20:31 +00:00
Roshan Pius
0cf3c25189 Merge "build(nfc): Create framework-nfc sdk library" into main am: 999d9a1924
Original change: https://android-review.googlesource.com/c/platform/build/+/2828697

Change-Id: I408cf06d756d0c767c90840dd7bcdc1fb6e5ae37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 18:09:23 +00:00
Roshan Pius
999d9a1924 Merge "build(nfc): Create framework-nfc sdk library" into main 2023-12-01 17:12:39 +00:00
Gurpreet Singh
04c85b3d00 [automerger skipped] Bump SDK Extension version to 11 am: 9bb555ba6b -s ours
am skip reason: Merged-In I67c18cfa7a2717cce738b17a53199fa595254068 with SHA-1 8deb7714a2 is already in history

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

Change-Id: I5b23c0ff298867cd5654f33d1436a8d35df350a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 17:10:03 +00:00
Mark White
530142a35a framework-minus-apex build should include framework-res
If an eng modifies a Framework resource and builds 'framework-minus-apex' it should rebuild framework-res

Test: m framework-minus-apex
Bug: 311452668
Ignore-AOSP-First: merge conflicts, need to be merged in downstream first
Change-Id: Ia8a7df9ce7c74bd942686ea520361f55fe4a42eb
2023-12-01 16:13:50 +00:00
Treehugger Robot
d19da41d09 Merge "Disable stack-depth" into main am: 60bb7b0d75 am: d8f1c7563b am: 40e991fe55
Original change: https://android-review.googlesource.com/c/platform/build/+/2854225

Change-Id: Ia9984c5588801b617c2086bc425b67021e650ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 14:27:30 +00:00
Treehugger Robot
559a2d88aa Merge "Disable stack-depth" into main am: 60bb7b0d75 am: c737e099b7 am: 81deda193e
Original change: https://android-review.googlesource.com/c/platform/build/+/2854225

Change-Id: Ic2273fc12542b7a0f959278ef1a01571e61ef7d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 14:26:37 +00:00
Treehugger Robot
40e991fe55 Merge "Disable stack-depth" into main am: 60bb7b0d75 am: d8f1c7563b
Original change: https://android-review.googlesource.com/c/platform/build/+/2854225

Change-Id: Ic05d08bb481f4cb8ce7b701b83be041c46ce9596
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 14:11:54 +00:00
Treehugger Robot
81deda193e Merge "Disable stack-depth" into main am: 60bb7b0d75 am: c737e099b7
Original change: https://android-review.googlesource.com/c/platform/build/+/2854225

Change-Id: Ib0075c18265ec2d9efcd9b035e6804081562353e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 13:54:36 +00:00
Treehugger Robot
d8f1c7563b Merge "Disable stack-depth" into main am: 60bb7b0d75
Original change: https://android-review.googlesource.com/c/platform/build/+/2854225

Change-Id: I729d3d26b16c3cbbfb30e72d484b4ad39cae619e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 13:20:50 +00:00
Treehugger Robot
c737e099b7 Merge "Disable stack-depth" into main am: 60bb7b0d75
Original change: https://android-review.googlesource.com/c/platform/build/+/2854225

Change-Id: I19abe80da66839fca1bf4ef187741ff8bb034f2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 13:15:45 +00:00
Treehugger Robot
60bb7b0d75 Merge "Disable stack-depth" into main 2023-12-01 12:17:33 +00:00
Treehugger Robot
61420ae7cc Merge "Revert "releasetools: Deprecate GKI build rules"" into main am: e5bfa38457 am: 2d67d0d293 am: 45c143156e
Original change: https://android-review.googlesource.com/c/platform/build/+/2854392

Change-Id: I8486b13d47714106675d76d1269e02518248dfbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 10:24:55 +00:00
Treehugger Robot
2cd3109af1 Merge "Revert "releasetools: Deprecate GKI build rules"" into main am: e5bfa38457 am: ceabadb916 am: 33a42856c5
Original change: https://android-review.googlesource.com/c/platform/build/+/2854392

Change-Id: I0e62faf20de1cd9bdaaba6df561658271718a0e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 10:24:02 +00:00
Treehugger Robot
45c143156e Merge "Revert "releasetools: Deprecate GKI build rules"" into main am: e5bfa38457 am: 2d67d0d293
Original change: https://android-review.googlesource.com/c/platform/build/+/2854392

Change-Id: I508ade059dc8930a54aaa02468c8a8a7fc03201f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 09:53:14 +00:00
Treehugger Robot
33a42856c5 Merge "Revert "releasetools: Deprecate GKI build rules"" into main am: e5bfa38457 am: ceabadb916
Original change: https://android-review.googlesource.com/c/platform/build/+/2854392

Change-Id: If8e29208288613d188bc189d6c54836254398a7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 09:51:27 +00:00
Treehugger Robot
ceabadb916 Merge "Revert "releasetools: Deprecate GKI build rules"" into main am: e5bfa38457
Original change: https://android-review.googlesource.com/c/platform/build/+/2854392

Change-Id: Ib6b0d2e7fe90896b6e73305be4bd16be3c9f059f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 09:15:43 +00:00
Treehugger Robot
2d67d0d293 Merge "Revert "releasetools: Deprecate GKI build rules"" into main am: e5bfa38457
Original change: https://android-review.googlesource.com/c/platform/build/+/2854392

Change-Id: I4ed81da9e95f73e54059753a4f78558d635db6ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 09:09:51 +00:00
Yi-Yo Chiang
18650c7be0 releasetools: Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE
This variable is always false or empty now, so clean up remaining
references to the variable.

Bug: 241346584
Test: Presubmit
Change-Id: I5dd3d356729d0bd2639633580bbb85f8b03582cf
2023-12-01 09:03:08 +00:00
Treehugger Robot
e5bfa38457 Merge "Revert "releasetools: Deprecate GKI build rules"" into main 2023-12-01 08:18:40 +00:00
Jooyung Han
a7bb8532f6 Use SOONG_STUB_VENDOR_LIBRARIES for vendor linker.config.pb
STUB_LIBRARIES lists all stub libraries including "system" libraries.
There can be a library that provides "stub" only for "system" variant
while its vendor variant doesn't. (e.g. libz). In such cases, using
STUB_LIBRARIES will result a wrong "provide" list in
vendor/etc/linker.config.pb.

So, instead, use SOONG_STUB_VENDOR_LIBRARIES which only lists stub
libraries that are installed in /vendor.

Bug: 313806237
Test: m & cvd start
Test: $OUT/vendor/etc/linker.config.pb doesn't list libz.so
Change-Id: If0f2089594bda5f799fd495f80a27493553cb4e1
2023-12-01 16:39:48 +09:00
Yi-Yo Chiang
92a517d75e Revert "releasetools: Deprecate GKI build rules"
This reverts commit faaede0f01.

Reason for revert: caused GSI sign failure b/311134118#comment23

Change-Id: Id794a8ab3369c907834a73cc88ea1640dc7492d1
2023-12-01 07:02:17 +00:00
Treehugger Robot
923d4647b0 Merge "Increase scudo MTE buffer for fullmte devices" into main am: 1a9dd1c7de am: 8e0c07166d am: 898b45d564
Original change: https://android-review.googlesource.com/c/platform/build/+/2819967

Change-Id: Ie823a10b9987acbde9f8830919272a952485fa09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 04:07:40 +00:00
Treehugger Robot
51e2d6795a Merge "Remove non-functional check owners script that pre-dated gerrit." into main am: 45db0e0c17 am: 69e2311d42 am: c2426e1b86
Original change: https://android-review.googlesource.com/c/platform/build/+/2852287

Change-Id: Ic48646520b00d4bb9fbd99b9f2918a6cf22445b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 04:07:06 +00:00
Treehugger Robot
8e2fec72ce Merge "Increase scudo MTE buffer for fullmte devices" into main am: 1a9dd1c7de am: 38bfccfdc9 am: 92c4d85ee3
Original change: https://android-review.googlesource.com/c/platform/build/+/2819967

Change-Id: Ibab1ced474f6b93711cdadb1ceab087da1b056e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 04:06:09 +00:00
Treehugger Robot
9c6515f8a1 Merge "Remove non-functional check owners script that pre-dated gerrit." into main am: 45db0e0c17 am: aa17389511 am: 58bf38473c
Original change: https://android-review.googlesource.com/c/platform/build/+/2852287

Change-Id: I4c60484d62893f491f2b03475f03685418d14f36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 04:05:54 +00:00
Treehugger Robot
898b45d564 Merge "Increase scudo MTE buffer for fullmte devices" into main am: 1a9dd1c7de am: 8e0c07166d
Original change: https://android-review.googlesource.com/c/platform/build/+/2819967

Change-Id: I3bbd8a3ee3e7baca2849dfa5d0aef2bfef9d56f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 03:50:14 +00:00
Treehugger Robot
c2426e1b86 Merge "Remove non-functional check owners script that pre-dated gerrit." into main am: 45db0e0c17 am: 69e2311d42
Original change: https://android-review.googlesource.com/c/platform/build/+/2852287

Change-Id: I79a3f99f6567d6fe281ceb3f9a8efd966581e1c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 03:50:04 +00:00
Treehugger Robot
92c4d85ee3 Merge "Increase scudo MTE buffer for fullmte devices" into main am: 1a9dd1c7de am: 38bfccfdc9
Original change: https://android-review.googlesource.com/c/platform/build/+/2819967

Change-Id: I12bfe69bc530d58c448c6293d825b0a8dbbe8b46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 03:34:46 +00:00