Inseob Kim
5b17e679f6
Merge "Add support for auto-generated characteristics RRO" into main am: 8fc7cf6301
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2818463
Change-Id: I39101709a273ed25f4588c7d11694daa14a7cc17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-17 05:43:44 +00:00
Inseob Kim
f145ffb2ac
Merge "Add support for auto-generated characteristics RRO" into main am: 8fc7cf6301
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2818463
Change-Id: I3604a488de2c59bcebf01ba121124f8032905a1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-17 05:43:37 +00:00
Inseob Kim
8fc7cf6301
Merge "Add support for auto-generated characteristics RRO" into main
2023-11-17 05:02:28 +00:00
Jihoon Kang
9ff93095c7
Merge "Revert "Disable from-text stub build for sdk products"" into main am: 3666e601ec
am: b0146455c7
am: c1fc7602aa
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2835872
Change-Id: I886f8687143a8a1f68b7ddcec2bcf33ce87cf230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-17 02:08:20 +00:00
Treehugger Robot
1b6087fdf9
Merge "Disable from-text stub build for sdk products" into main am: b0d8fafba8
am: 5d763858eb
am: 0f20cbc643
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2834692
Change-Id: If31d0a71056e952085ffcbaf310d8d7622e4f8f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-17 02:07:49 +00:00
Jihoon Kang
9e0998b777
Revert^2 "Disable from-text stub build for sdk products"
...
This change introduces `PRODUCT_BUILD_FROM_SOURCE_STUB` product
variable, which is set to true for sdk targets.
This change resubmits https://r.android.com/2834692 .
Test: m TARGET_PRODUCT=sdk TARGET_RELEASE=trunk_staging sdk and inspect ninja query to verify that stubs are built from source
Bug: 311203379
Change-Id: I7d9f833ae76ceabbf2ce4df0141688e24ea164c8
2023-11-17 01:52:12 +00:00
Jihoon Kang
c1fc7602aa
Merge "Revert "Disable from-text stub build for sdk products"" into main am: 3666e601ec
am: b0146455c7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2835872
Change-Id: Ib31bc58dd30412c6c822531df3b227b1f9e4093e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-17 01:35:16 +00:00
Treehugger Robot
0f20cbc643
Merge "Disable from-text stub build for sdk products" into main am: b0d8fafba8
am: 5d763858eb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2834692
Change-Id: I70a0ecabb446e2f7e5b4ef961dbf7deadc87e5c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-17 01:34:45 +00:00
Jihoon Kang
c61d9b5707
Merge "Revert "Disable from-text stub build for sdk products"" into main am: 3666e601ec
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2835872
Change-Id: Ife070492ccecfd447cb969ffc57f824d65f48ca6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-17 01:20:09 +00:00
Jihoon Kang
b0146455c7
Merge "Revert "Disable from-text stub build for sdk products"" into main am: 3666e601ec
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2835872
Change-Id: Ifda62b2e985c5e47b7a1f40351b5fb063b51a42c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-17 01:20:06 +00:00
Jihoon Kang
3666e601ec
Merge "Revert "Disable from-text stub build for sdk products"" into main
2023-11-17 01:04:34 +00:00
Treehugger Robot
3e973b4b2f
Merge "Disable from-text stub build for sdk products" into main am: b0d8fafba8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2834692
Change-Id: I6b4802d71c0db32c45a3b6c2fc80ebc100225e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-17 01:04:14 +00:00
Treehugger Robot
5d763858eb
Merge "Disable from-text stub build for sdk products" into main am: b0d8fafba8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2834692
Change-Id: I9cf9c532ae3eb1b94bead4400b0aef1172d818eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-17 01:04:08 +00:00
Jihoon Kang
608493e0ff
Revert "Disable from-text stub build for sdk products"
...
Revert submission 2832580-sdk-from-source-stub
Reason for revert: Breaking sdk builds
Reverted changes: /q/submissionid:2832580-sdk-from-source-stub
Change-Id: Id2e1bf4b5d513d12bb794405a74dfdbed870c4e1
2023-11-17 00:58:42 +00:00
Treehugger Robot
b0d8fafba8
Merge "Disable from-text stub build for sdk products" into main
2023-11-17 00:29:05 +00:00
Jihoon Kang
3621c914a6
Disable from-text stub build for sdk products
...
This change introduces `PRODUCT_BUILD_FROM_SOURCE_STUB` product
variable, which is set to true for sdk targets.
Test: m TARGET_PRODUCT=sdk TARGET_RELEASE=trunk_staging sdk and inspect ninja query to verify that stubs are built from source
Bug: 311203379
Change-Id: I99ad04fb6b61eebfeee68f23f8865ab55d69cdbd
2023-11-16 23:09:29 +00:00
Anas Sulaiman
ce4d681177
Merge "fix RE for metalava actions" into main am: 3e17366053
am: 87c1aac646
am: 0d5085bb37
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2833312
Change-Id: Icd90151217f227abfb29fb0f2c99f5f602383cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-16 20:41:02 +00:00
Anas Sulaiman
0d5085bb37
Merge "fix RE for metalava actions" into main am: 3e17366053
am: 87c1aac646
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2833312
Change-Id: I9e3a4cb6e1c2a4e6becbabaf40d060bb77284d1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-16 19:47:21 +00:00
Colin Cross
9cb51b7446
Store ALL_DEPS under my_register_name
...
ALL_DEPS was original stored in ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS for
use by the old licensing code. That has been removed, and it is now
only used by module-info.json. Storing it with $(LOCAL_MODULE) causes
_32 entries in module-info.json to be missing dependencies, and causes
the dependencies from _32 variants to be squashed into the normal
variants. Replace ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS with
ALL_MODULES.$(my_register_name).ALL_DEPS.
Test: builds
Change-Id: Ieddfcddd8547b61bd938ae051beb738268aac5af
2023-11-16 11:46:40 -08:00
Anas Sulaiman
eadef4c104
Merge "fix RE for metalava actions" into main am: 3e17366053
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2833312
Change-Id: Ic312e8b3af062820c6031fdd1532298d1f977c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-16 19:15:57 +00:00
Anas Sulaiman
87c1aac646
Merge "fix RE for metalava actions" into main am: 3e17366053
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2833312
Change-Id: If89db6ea7bbba7a33c59a994f14b432d54085ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-16 19:14:01 +00:00
Anas Sulaiman
3e17366053
Merge "fix RE for metalava actions" into main
2023-11-16 18:42:24 +00:00
Kiyoung Kim
61d025bd53
Merge "Deprecate VNDK based on feature flag" into main am: 25b71e0689
am: d53d1c7791
am: 91866fe2e8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2803353
Change-Id: Ia7f47dded405681b557f891644b89725c322847f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-16 02:16:29 +00:00
Kiyoung Kim
91866fe2e8
Merge "Deprecate VNDK based on feature flag" into main am: 25b71e0689
am: d53d1c7791
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2803353
Change-Id: I0b1d8c5e0bec3f6af4748ee9dcce5c427a89cd13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-16 01:43:36 +00:00
Kiyoung Kim
b17f5181ee
Merge "Deprecate VNDK based on feature flag" into main am: 25b71e0689
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2803353
Change-Id: I5e8ea64aee01bc9cfac00dc3709ad2bb8b69e52f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-16 01:12:24 +00:00
Kiyoung Kim
d53d1c7791
Merge "Deprecate VNDK based on feature flag" into main am: 25b71e0689
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2803353
Change-Id: I7fc5f38c227ad4d45e6c7c76d818f75999186c15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-16 01:10:49 +00:00
Kiyoung Kim
25b71e0689
Merge "Deprecate VNDK based on feature flag" into main
2023-11-16 00:37:29 +00:00
Anas Sulaiman
5dacf0f6dd
fix RE for metalava actions
...
Some of those actions use unzip which is not available in the source
tree and needs to be installed in the container.
Bug: b/309783005
Test: Ran an android build and verified there are no local fallbacks from metalava actions.
Change-Id: I360c3fb30e2eacc0615ed636115bce011bff5bf3
2023-11-15 20:39:45 +00:00
Greg Kaiser
b13386335a
Merge "Reland: Require TARGET_RELEASE for builds" into main am: 2c8ece0b25
am: 0f62caed3b
am: 4afb07c3c8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824863
Change-Id: I78c563496d510c77a753683f0843227988ae6cf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 15:21:55 +00:00
Greg Kaiser
4afb07c3c8
Merge "Reland: Require TARGET_RELEASE for builds" into main am: 2c8ece0b25
am: 0f62caed3b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824863
Change-Id: Ia1d11540daab184afbb103c04d89b6895b8135be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 14:49:29 +00:00
Greg Kaiser
0f62caed3b
Merge "Reland: Require TARGET_RELEASE for builds" into main am: 2c8ece0b25
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824863
Change-Id: I905bd794ad0c5de8967a029ef7cdbb8dc779817b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 14:17:51 +00:00
Greg Kaiser
89f7e09c03
Merge "Reland: Require TARGET_RELEASE for builds" into main am: 2c8ece0b25
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824863
Change-Id: If92a7892878532c87fa3e3e6035cb65f37ebd242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 14:17:51 +00:00
Greg Kaiser
2c8ece0b25
Merge "Reland: Require TARGET_RELEASE for builds" into main
2023-11-15 13:42:18 +00:00
Treehugger Robot
243fae3235
Merge "Add .product suffix for the product variants" into main am: 251ad2f41f
am: 602c9df271
am: b3eeff3c2b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2829418
Change-Id: Iba9a5da11ed2233682467bc85f3b40c9704a8bd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 09:56:38 +00:00
Treehugger Robot
b3eeff3c2b
Merge "Add .product suffix for the product variants" into main am: 251ad2f41f
am: 602c9df271
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2829418
Change-Id: I751168efb5ea5a947c5035effacd1d891f1fc172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 09:05:51 +00:00
Treehugger Robot
0c7dd1f269
Merge "Add .product suffix for the product variants" into main am: 251ad2f41f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2829418
Change-Id: I5e338a57785f6a84ed4269895bdeeeda0b454116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 08:35:39 +00:00
Treehugger Robot
602c9df271
Merge "Add .product suffix for the product variants" into main am: 251ad2f41f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2829418
Change-Id: I9a8ec444e9fdc19e3426d5f163ec61b765306868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 08:35:10 +00:00
Justin Yun
59fbdf0bba
Add .product suffix for the product variants
...
Instead of adding .vendor suffix, add .product suffix to include
product variants.
Bug: 309511650
Test: atest com.android.gts.vndk.VndkDependencyTest#testVndkDependencyTestCase
Change-Id: I6d578be95c618c565347f0fdf660e82945ac77a3
2023-11-15 14:59:39 +09:00
Alyssa Ketpreechasawat
82f52a7cfc
Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main am: c7bc53999d
am: 566f69178c
am: b02812d84c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2822531
Change-Id: Ia37497d25763fcd2ef563f2cc6097a9cae65737b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 20:42:55 +00:00
Alyssa Ketpreechasawat
b02812d84c
Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main am: c7bc53999d
am: 566f69178c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2822531
Change-Id: I004ff3a20eccd4ebc2a0105551f80e0571da1ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 20:07:39 +00:00
Alyssa Ketpreechasawat
9364c5e506
Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main am: c7bc53999d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2822531
Change-Id: I594a68a6b0e12363378a62e7c59bae2a706f455d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 19:46:03 +00:00
Alyssa Ketpreechasawat
566f69178c
Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main am: c7bc53999d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2822531
Change-Id: I28dde980714a4eb4571f605c6e217f5750e8f6bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 19:44:58 +00:00
Alyssa Ketpreechasawat
c7bc53999d
Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main
2023-11-14 19:13:32 +00:00
Colin Cross
93e1e702a4
Remove ALL_DEPS.MODULES
...
Nothing reads it any more.
Test: m checkbuild
Change-Id: I6f11a5273b0c2cc92a3b0c49bbefbf084cb734a1
2023-11-14 11:03:08 -08:00
Jeff Sharkey
d545b872f3
Merge "Update XML template to reflect null device." into main
2023-11-14 18:06:54 +00:00
Florian Mayer
beb5bed41f
Increase scudo MTE buffer for fullmte devices
...
Bug: 309446692
Change-Id: Idfb7956a1f7031d908f026d120fe8e253976ff4f
2023-11-14 02:51:14 -08:00
Justin Yun
6dc5924d72
Merge "Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN" into main am: 136fa83d4e
am: df2645967d
am: d7d7e5c61e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2825990
Change-Id: Ifcd1e9f0cd26c72f57652e9eed424ec92e7977f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 01:09:39 +00:00
Justin Yun
d7d7e5c61e
Merge "Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN" into main am: 136fa83d4e
am: df2645967d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2825990
Change-Id: Iebeabebf8a98dd93e5c2d9380e1d81fbc47e4ac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 00:37:31 +00:00
Justin Yun
df2645967d
Merge "Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN" into main am: 136fa83d4e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2825990
Change-Id: I83bb0eaa6e9cb8bb87c46ac1977d1200675f5579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 00:07:25 +00:00
Justin Yun
0379fe98ee
Merge "Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN" into main am: 136fa83d4e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2825990
Change-Id: Ie2c6ea2b8897810ab5504b3d88cf775e358ec34a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 00:07:02 +00:00