Commit Graph

97038 Commits

Author SHA1 Message Date
Treehugger Robot
d81c46b595 Merge "check-flagged-apis: suppress unused variable warning" into main am: c039204466
Original change: https://android-review.googlesource.com/c/platform/build/+/3069746

Change-Id: I06af81c383f3ffb3f6b19b852d8f5f539e2766dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 19:17:26 +00:00
Treehugger Robot
a0166f7362 Merge "check-flagged-apis: add support for method with parameters" into main am: 83705ef7d1
Original change: https://android-review.googlesource.com/c/platform/build/+/3061973

Change-Id: I5e56d85c81adae878405ea8c35a2ea2acb4bf309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 19:17:14 +00:00
Treehugger Robot
c039204466 Merge "check-flagged-apis: suppress unused variable warning" into main 2024-05-02 19:01:48 +00:00
Treehugger Robot
83705ef7d1 Merge "check-flagged-apis: add support for method with parameters" into main 2024-05-02 18:59:48 +00:00
Daniel Zheng
4477ffc2b9 Merge "create_brick_ota: logic fix" into main am: 76f13d280c
Original change: https://android-review.googlesource.com/c/platform/build/+/3072303

Change-Id: I0f19dd9084ede2d6aafb459347acf94dadcc473c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 18:25:41 +00:00
Treehugger Robot
f002c90953 Merge "Add * support products and modules" into main am: 7bff3a85f9
Original change: https://android-review.googlesource.com/c/platform/build/+/3059622

Change-Id: Ic969d7aa37ea4231ccb93bfdbaee5917c1e17b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 18:25:21 +00:00
Daniel Zheng
76f13d280c Merge "create_brick_ota: logic fix" into main 2024-05-02 18:10:51 +00:00
Treehugger Robot
7bff3a85f9 Merge "Add * support products and modules" into main 2024-05-02 18:07:48 +00:00
Daniel Zheng
7e4cc58f2d create_brick_ota: logic fix
ota_metadata should be initialized outside of the if block.

Bug: 3072303
Test: th
Change-Id: Iabe52be3557c71921586d960d8a8a91c33d5558b
2024-05-02 09:55:45 -07:00
Mårten Kongstad
fad2e0c502 Merge "check-flagged-apis: change internal format" into main am: 8b81af4e11
Original change: https://android-review.googlesource.com/c/platform/build/+/3069745

Change-Id: I28e680b62f3a933a7c75c3b8b400342390c12247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 15:16:15 +00:00
Mårten Kongstad
8b81af4e11 Merge "check-flagged-apis: change internal format" into main 2024-05-02 14:51:49 +00:00
Mårten Kongstad
cd93aeb947 check-flagged-apis: suppress unused variable warning
Bug: 334870672
Test: m check-flagged-apis # verify no Lint warnings
Change-Id: If4fb93703f0f0bf3f27e6ec052cf488796bd717e
2024-05-02 14:01:12 +02:00
Mårten Kongstad
b4a14bfaa9 check-flagged-apis: add support for method with parameters
Teach check-flagged-apis to parse methods containing parameters.

Bug: 334870672
Test: atest --host check-flagged-apis-test
Change-Id: I171660b914b73fd85e03ed9300c2c81f33d80d61
2024-05-02 09:53:54 +02:00
Mårten Kongstad
ece054c856 check-flagged-apis: change internal format
Switch the internal format to represent Symbols to (something close to)
the format described in section 4.3.2 of the JVM spec, i.e.

  com/android/SomeClass/someMethod(II[Ljava/lang/String;)Z

This will make parsing method parameters from api-versions.xml easier,
as that file already uses this format, and converting API signature
files to the same format is less painful than going in the other
direction.

Bug: 334870672
Test: atest --host check-flagged-apis-test
Change-Id: I1e1fb8fe208cd51cce2cc129f5aa1cb495672c16
2024-05-02 09:50:33 +02:00
Treehugger Robot
389d17186d Merge "Disable kotlin -checkdiscard rule" into main am: 7faf630b7c
Original change: https://android-review.googlesource.com/c/platform/build/+/3070709

Change-Id: Icc9652ea8fa25a2261fbb076c7fd193b49a39be2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 01:11:32 +00:00
Treehugger Robot
7faf630b7c Merge "Disable kotlin -checkdiscard rule" into main 2024-05-02 00:50:05 +00:00
Jared Duke
32c8a6a43d Disable kotlin -checkdiscard rule
kotlin-stdlib is included transitively as a library jar by way of
androidx.annotations, which means we cannot ensure associated classes
are discarded by R8. Disable the related `-checkdiscard` proguard rule
until that inclusion is resolved, avoiding spurious warnings in build
output.

Bug: 302383328
Test: m
Flag: NA
Change-Id: I7514e6841735e95e1a16d42d6a6e134103ecb108
2024-05-01 23:34:24 +00:00
Treehugger Robot
9b261d0362 Merge "Add a release config map override for go devices" into main am: e78ad285cb
Original change: https://android-review.googlesource.com/c/platform/build/+/3069967

Change-Id: Iae3b30bc43ae35d292520759e4ce1126aaec77c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 23:22:08 +00:00
Treehugger Robot
e78ad285cb Merge "Add a release config map override for go devices" into main 2024-05-01 23:05:20 +00:00
Spandan Das
68dce16b3f Add a release config map override for go devices
One use case for this is to select go prebuilt apexes when building go
devices.

Bug: 338002385
Test: presubmits
Test: verified that this map shows up in `get_build_var
PRODUCT_RELEASE_CONFIG_MAPS` of a go device

Change-Id: I5505c581597bbd5a4e5f8fc6cd69987f67f0adb6
2024-05-01 22:04:36 +00:00
Treehugger Robot
b40a227dc2 Merge "Remove deprecated Goma makefiles" into main am: b604cf3f81
Original change: https://android-review.googlesource.com/c/platform/build/+/3070442

Change-Id: Ide52e63074c8527b5f42722090100a65582f1fb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 20:44:34 +00:00
Treehugger Robot
b604cf3f81 Merge "Remove deprecated Goma makefiles" into main 2024-05-01 20:23:18 +00:00
Cole Faust
dabe8ef1f5 Merge "sdk-addon: Prevent nested data/ inside $(PRIVATE_STAGING_DIR)" into main am: c80e7eeb77
Original change: https://android-review.googlesource.com/c/platform/build/+/2976591

Change-Id: Id56d95de97977f0d57632a2925e0c90b38a7df23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 19:46:56 +00:00
Cole Faust
c80e7eeb77 Merge "sdk-addon: Prevent nested data/ inside $(PRIVATE_STAGING_DIR)" into main 2024-05-01 19:32:12 +00:00
Kousik Kumar
fe9aaa23fe Remove deprecated Goma makefiles
Goma is no longer used with android platform builds. Just a minor cleanup.

Bug: n/a
Change-Id: I62844c1d555677006a1022dab4f12bcfd7e55758
2024-05-01 18:14:17 +00:00
Treehugger Robot
fc7bd470e8 Merge ""Steal" single value variables in rbc inheritance" into main am: 0c2ef754f3
Original change: https://android-review.googlesource.com/c/platform/build/+/3067949

Change-Id: Ibc94715e0ae835832e77eb7a7ace6906f567a1ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 15:58:15 +00:00
Treehugger Robot
0c2ef754f3 Merge ""Steal" single value variables in rbc inheritance" into main 2024-05-01 15:54:12 +00:00
Ted Bauer
3011ec66ed Merge "Update dependencies for new aconfig flag storage" into main am: daa3c71739
Original change: https://android-review.googlesource.com/c/platform/build/+/3068041

Change-Id: Iad23c5a46f16b23155c4cfdf27278d405bfd5907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 15:51:27 +00:00
Ted Bauer
daa3c71739 Merge "Update dependencies for new aconfig flag storage" into main 2024-05-01 15:37:20 +00:00
Cole Faust
8383184b7a "Steal" single value variables in rbc inheritance
This behavior of "stealing" values from parent makefiles is needed to
match make. We already had similar behavior for list variables via
the __move_items function, but were missing it for single value
variables.

Test: ./out/rbcrun -mode rbc ./build/make/tests/run.rbc
Change-Id: Ib320b9b1cce0224184f585c7a391be1b5353b440
2024-04-30 17:30:18 -07:00
Ted Bauer
4560e3ae8f Update dependencies for new aconfig flag storage
Bug: 328444881
Test: m
Change-Id: I3685a74e9e93a6ecb89a054e243b48b67f470d55
2024-04-30 23:57:51 +00:00
Spandan Das
5501c82004 Merge "Revert "Align boot jar exclusion with apex_contributions"" into main am: 7d5b29ef85
Original change: https://android-review.googlesource.com/c/platform/build/+/3067767

Change-Id: I6045af65d63876cda4fbcfebff0d3de23b160cb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-30 23:29:26 +00:00
Spandan Das
7d5b29ef85 Merge "Revert "Align boot jar exclusion with apex_contributions"" into main 2024-04-30 23:24:05 +00:00
Dennis Shen
a8d8b351da Merge "aconfig: add a new aconfig storage file flag listing api" into main am: c0102331c8
Original change: https://android-review.googlesource.com/c/platform/build/+/3065243

Change-Id: Ide49f40e593c0930117192ee559552ece6e2dd27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-30 23:22:55 +00:00
Spandan Das
213847d3f6 Revert "Align boot jar exclusion with apex_contributions"
This reverts commit f340066ee3.

Reason for revert: Breaks go/ab/git_main:barbet-ap2a-userdebug

Change-Id: I62639525d5b2507a07c3145ff556fdf2b156cb01
2024-04-30 23:10:28 +00:00
Dennis Shen
c0102331c8 Merge "aconfig: add a new aconfig storage file flag listing api" into main 2024-04-30 23:06:18 +00:00
Treehugger Robot
60517e93c1 Merge "Align boot jar exclusion with apex_contributions" into main am: 3c5b13078b
Original change: https://android-review.googlesource.com/c/platform/build/+/3063301

Change-Id: I03ecd32acb575d8a6a0f20ab059a9e3468dbeb92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-30 22:06:35 +00:00
Treehugger Robot
3c5b13078b Merge "Align boot jar exclusion with apex_contributions" into main 2024-04-30 21:46:01 +00:00
Treehugger Robot
62206ac83a Merge "Move coverage builds prebuilt special case to make" into main am: 40cc23b709
Original change: https://android-review.googlesource.com/c/platform/build/+/3065665

Change-Id: If86509e853f34205d5a12714215f76b1941bc293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-30 20:27:19 +00:00
Treehugger Robot
40cc23b709 Merge "Move coverage builds prebuilt special case to make" into main 2024-04-30 20:04:44 +00:00
Treehugger Robot
c252a67443 Merge "Move aosp_x86_64 away from non-AB" into main am: 13f8f70758
Original change: https://android-review.googlesource.com/c/platform/build/+/3065894

Change-Id: I195e4721e4157f2da4c7accfa1b0ec7e5d74f7ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-30 18:55:29 +00:00
Treehugger Robot
13f8f70758 Merge "Move aosp_x86_64 away from non-AB" into main 2024-04-30 18:20:06 +00:00
Dennis Shen
45c94c6421 aconfig: add a new aconfig storage file flag listing api
added a new function called list_flag_with_info to list all the flags
given all four storage files (package.map, flag.map, flag.val, flag.info).
also exported this api thru cxx interface so aconfigd can use it.

Bug: b/312444587
Test: atest -c
Change-Id: Ibbfe657b980d40e25e5e28962b930338192e2d98
2024-04-30 17:52:44 +00:00
Kelvin Zhang
892b51ab7d Move aosp_x86_64 away from non-AB
non-AB is deprecated, move GSI targets to AB updates

Test: th
Bug: 334489639
Change-Id: I96e398c43f594cdc4ac6e20cf9444cb67a80eee3
2024-04-30 09:34:58 -07:00
Treehugger Robot
2e5fde3377 Merge "Convert BuildIgnoreApexContritbutions variable to a boolean" into aosp-main-future 2024-04-30 01:39:19 +00:00
Ted Bauer
b80523c4ec Merge "Add cc_defaults containing libs needed for static linking" into main am: ced25ac630
Original change: https://android-review.googlesource.com/c/platform/build/+/3065623

Change-Id: I3d4fd0ae3c38d1659ba31f3f52a17322da0cb22f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-30 01:35:21 +00:00
Ted Bauer
ced25ac630 Merge "Add cc_defaults containing libs needed for static linking" into main 2024-04-30 01:20:21 +00:00
Treehugger Robot
4c575db098 Merge "Add tool to determine if products can be lunched" into main am: 15967616ca
Original change: https://android-review.googlesource.com/c/platform/build/+/3065942

Change-Id: Ib083f9e0def5c121e058bb2f74fc7066b60d9040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-30 00:21:15 +00:00
Treehugger Robot
15967616ca Merge "Add tool to determine if products can be lunched" into main 2024-04-29 23:57:36 +00:00
Ted Bauer
d724dd04e2 Add cc_defaults containing libs needed for static linking
Bug: 328444881
Test: m
Change-Id: I35cbce94301415381b3ad38d7e5c697f9c010856
2024-04-29 23:41:52 +00:00