Wei Li
581b781ac4
Merge "Include following files in the SBOM of layoutlib, which are disted in Soong." into main
2023-11-02 22:17:30 +00:00
Anas Sulaiman
bd93c389e1
Merge "fix potential encoding issues in remote actions" into main am: 39ccc6378e
am: 78bbac7d51
am: 98f548c3e9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2814613
Change-Id: I8a7c3e4acfe338cc8926025592ab2e2fbc20f3f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-02 19:27:37 +00:00
Anas Sulaiman
98f548c3e9
Merge "fix potential encoding issues in remote actions" into main am: 39ccc6378e
am: 78bbac7d51
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2814613
Change-Id: I927d63a80e44e3ee331ecd1223fe7f36119290d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-02 18:49:40 +00:00
Anas Sulaiman
9a22984fb9
Merge "fix potential encoding issues in remote actions" into main am: 39ccc6378e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2814613
Change-Id: I6a7e03f15c3b242d33b8dda443a5b7f2ecedc49b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-02 18:23:38 +00:00
Anas Sulaiman
78bbac7d51
Merge "fix potential encoding issues in remote actions" into main am: 39ccc6378e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2814613
Change-Id: I1a036f07e5d8c39ec4abfbb200b780b9cc8322b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-02 18:20:41 +00:00
Anas Sulaiman
39ccc6378e
Merge "fix potential encoding issues in remote actions" into main
2023-11-02 18:02:55 +00:00
Colin Cross
710c3cb5fb
Remove code related to unused LOCAL_* variables
...
LOCAL_JETIFIER_ENABLED, LOCAL_NO_PIC, LOCAL_PREBUILT_STRIP_COMMENTS,
LOCAL_RMTYPEDEFS, and *.vts sources are never used. Remove them
and the code related to them.
Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I2ca9e674602057cc163b8bc28b0c57a0b7cc4361
2023-11-02 10:45:33 -07:00
Colin Cross
fda3c6a36a
Delete unused variables from clear_vars.mk
...
Kati analysis in AOSP spends around 6 seconds in clear_vars.mk.
Delete any variables in clear_vars.mk that are not referenced anywhere
else in build/make/core.
Test: no change to build-aosp_cf_x86_64_phone.ninja
Change-Id: I7e0db3c02d297de825acbfbd1a0f05724d1e846d
2023-11-02 10:33:25 -07:00
Colin Cross
1b7f072505
Remove obsolete ide.mk and related code
...
The code to generate an eclipse classpath is obsolete, remove it and
related code.
Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I7e1b6268b98ecbb7be88db8945dd7b30acc695ba
2023-11-02 10:16:57 -07:00
Colin Cross
34fe77a493
Removed unused license code
...
Nothing ever reads ALL_DEPS.*.LICENSE, and its an ever-growing list
that is sorted every time, which is extremely expensive.
notice_target is never set after I4cddf9a381a1258bdc2b1b42be72c447df10d234,
remove all the related code.
Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I0fa6a46e62ef8aa78873b43d3064b57b1c54de51
2023-11-02 10:10:36 -07:00
Colin Cross
aed37d79f2
Remove obsolete uses of LOCAL_MODULE_TAGS
...
Only LOCAL_MODULE_TAGS := tests is used is meaningful in the current
implementation. "optional" and "samples" both exist in the tree, but
are meaningless. "gnu", "user", "eng" and "debug" are no longer used,
and are already forbidden by the unusual tags check. The info from the
"module" target is now available in module-info.json. Delete all the
irrelevant code.
Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I04e8178a362e382a1a4bd997c1b4c3a480db7714
2023-11-02 10:10:06 -07:00
LaMont Jones
eacc292ce8
Reapply "release_config: build flags can be lists"
...
Allow a build flag definition to indicate that its value should be the
concatentation of assignements, rather than the final assigned value. In
this case, the "default" value from the flag definition is always
present as the start of the list.
The initial use case for this is RELEASE_ACONFIG_VALUE_SETS, where we
need apply multiple definition files that should be processed to arrive
at the final value.
This reverts commit b05eaac092
.
Bug: b/302593603, b/304814040
Test: manual
Change-Id: I7370c509ceb3952f7feb2351673d8f2ba86d704b
2023-11-02 15:56:10 +00:00
LaMont Jones
df398d19d4
Reapply "Add support for product-specific build flags"
...
1. release config maps now specify where the flag definitions are found.
2. PRODUCT_RELEASE_CONFIG_MAPS specifies additional release config map
files to use.
This allows product config to specify build flags, which can then be
specified by users of that product.
This reverts commit 75bfc37ef4
.
Bug: b/302593603
Test: manual
Change-Id: I031a00459893644d7f67b63b982db9ae9015ae4d
2023-11-02 15:56:03 +00:00
Treehugger Robot
f687f0439a
Merge changes from topic "revert-2787001-product-build-flags-PYFTWILGBK" into main am: 821ab221be
am: 04d56713b8
am: d00589f45f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2813823
Change-Id: If8bdec9ac438a5de729af5aa427deae2dba35b13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-02 09:51:31 +00:00
Treehugger Robot
d00589f45f
Merge changes from topic "revert-2787001-product-build-flags-PYFTWILGBK" into main am: 821ab221be
am: 04d56713b8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2813823
Change-Id: Ia46fb197af1f86def3db9da834c242498ad24828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-02 09:10:21 +00:00
Treehugger Robot
65793a4a9a
Merge changes from topic "revert-2787001-product-build-flags-PYFTWILGBK" into main am: 821ab221be
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2813823
Change-Id: I62ba86922b59abe4413c6f439afbb762c5b6cb0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-02 08:46:12 +00:00
Treehugger Robot
04d56713b8
Merge changes from topic "revert-2787001-product-build-flags-PYFTWILGBK" into main am: 821ab221be
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2813823
Change-Id: Ic660577b64ed322428d33dfd03574f0830cfc6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-02 08:44:33 +00:00
Treehugger Robot
821ab221be
Merge changes from topic "revert-2787001-product-build-flags-PYFTWILGBK" into main
...
* changes:
Revert "Add support for product-specific build flags"
Revert "release_config: build flags can be lists"
2023-11-02 08:06:39 +00:00
Justin Yun
925d1f517c
Set ro.product.vndk.version for VNDK v35
...
Until we have updated art mainline module, we must provide
ro.product.vndk.version to use product namespace for product apks.
This can be removed when art mainline module is updated.
Bug: 308676119
Test: See if product apps uses product-clns namespace in
cf_x86_64_phone-next-userdebug
Change-Id: I5030fb0f82c80e0cb94c89179e6c71df119368da
2023-11-02 11:48:39 +09:00
Colin Cross
75bfc37ef4
Revert "Add support for product-specific build flags"
...
Revert submission 2787001-product-build-flags
Reason for revert: Possible cause of b/308849337
Reverted changes: /q/submissionid:2787001-product-build-flags
Bug: 302593603
Bug: 308849337
Change-Id: I01b5905a0a20a1401dcc1267e7fafc893e57d637
2023-11-02 00:13:30 +00:00
Colin Cross
b05eaac092
Revert "release_config: build flags can be lists"
...
Revert submission 2787001-product-build-flags
Reason for revert: Possible cause of b/308849337
Reverted changes: /q/submissionid:2787001-product-build-flags
Bug: 302593603
Bug: 308849337
Change-Id: I6246d20201e674ba99faf6b880ecdc7ef934c653
2023-11-02 00:13:32 +00:00
Timothy Yiu
9c5cfa2926
Merge "Add config for FULL_SYSTEM_OPTIMIZE_JAVA" into main
2023-11-01 20:39:23 +00:00
Ted Bauer
5892f901e6
Merge "Revert^2 "Do not generate aconfig_flags.textproto"" into main am: ad2c02c98d
am: aac619afb2
am: 5a89019d66
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2812935
Change-Id: Ie8a0b275ce8d4db90f2a2e1b98e4ea3813e62e30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-01 19:14:55 +00:00
Ted Bauer
5a89019d66
Merge "Revert^2 "Do not generate aconfig_flags.textproto"" into main am: ad2c02c98d
am: aac619afb2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2812935
Change-Id: I4937f0003db6e030b30ae069bb5f688589a0b768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-01 18:15:29 +00:00
Ted Bauer
86fc7f100b
Merge "Revert^2 "Do not generate aconfig_flags.textproto"" into main am: ad2c02c98d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2812935
Change-Id: I4a297d8e196734f85407adcc41b10596ca6c0dbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-01 17:50:43 +00:00
Ted Bauer
aac619afb2
Merge "Revert^2 "Do not generate aconfig_flags.textproto"" into main am: ad2c02c98d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2812935
Change-Id: I07bb33da126c586d5148a6843c12b820f6c6940c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-01 17:48:00 +00:00
Anas Sulaiman
b72060b029
fix potential encoding issues in remote actions
...
The new docker image contains all en_*.UTF-8 locales to ensure Java (and
other) actions produce the correct bytes.
Bug: b/300624128
Test: Ran an android build and verified there are no encoding issues in
metalava outputs.
Change-Id: Id1eab37edfc71b3b56f4ac38259407c0a1b10667
2023-11-01 17:41:34 +00:00
Makoto Onuki
0fee92dc93
Add ravenwood test config template
...
Modeled after robolectric_test_config_template.xml
Bug: 292141694
Test: m nothing --no-skip-soong-tests
Test: m hoststubgen ravenwood-runtime tradefed atest && atest-dev HostStubGenTest-framework-test
Change-Id: I9ef906074df65c93d9e1a4b4998e6137196075ed
2023-11-01 11:37:03 -06:00
LaMont Jones
0225c052ac
Merge changes from topic "product-build-flags" into main am: 752703251a
am: e81b2f88d5
am: 25380c641e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2787002
Change-Id: Iea73a43ed2385e617565afee3eac03603771f0fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-01 17:12:16 +00:00
LaMont Jones
f7cbf5de56
Add support for product-specific build flags am: c6631fed48
am: a55aa32d52
am: bf1936dc82
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2787001
Change-Id: Iaf3f03a49661f80c8308fce479cef57774bce17d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-01 17:12:10 +00:00
Ted Bauer
ad2c02c98d
Merge "Revert^2 "Do not generate aconfig_flags.textproto"" into main
2023-11-01 17:05:20 +00:00
LaMont Jones
25380c641e
Merge changes from topic "product-build-flags" into main am: 752703251a
am: e81b2f88d5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2787002
Change-Id: If736f17058f3e0b4abe25c39b336e8f71b3c77d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-01 16:32:54 +00:00
LaMont Jones
bf1936dc82
Add support for product-specific build flags am: c6631fed48
am: a55aa32d52
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2787001
Change-Id: I858ea19d135b0b770ad75cc985132bacac3b2b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-01 16:32:50 +00:00
LaMont Jones
99845eeaba
Export build flags to soong.
...
This exports a map of build flags used in this release config to Soong.
Bug: b/302514918
Test: manual
Change-Id: Ia93195f09dee4945f07326eb7a5973c2ce2e025b
2023-11-01 16:16:53 +00:00
LaMont Jones
81456b9cf8
Merge changes from topic "product-build-flags" into main am: 752703251a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2787002
Change-Id: I2cb4bc38fc6d22c91bc2dde9e5c7d98d8378ed9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-01 16:10:38 +00:00
LaMont Jones
ec7a1e3a6e
Add support for product-specific build flags am: c6631fed48
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2787001
Change-Id: Ie07619c29a9bcfad593f279235f5fcf91106db80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-01 16:10:31 +00:00
LaMont Jones
e81b2f88d5
Merge changes from topic "product-build-flags" into main am: 752703251a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2787002
Change-Id: Iac84a2f9cc70d42a8460401689da169b55e95097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-01 16:07:31 +00:00
LaMont Jones
a55aa32d52
Add support for product-specific build flags am: c6631fed48
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2787001
Change-Id: Id7c6c22030dbe1693bded7e66c30a289e6e667c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-01 16:07:25 +00:00
Ted Bauer
c0d16595b3
Revert^2 "Do not generate aconfig_flags.textproto"
...
This reverts commit 49fbb31fcf
.
Reason for revert: textproto usages have been removed
Change-Id: I4021b5e79bcd114a610a529bc68e0be50500b339
2023-11-01 16:03:51 +00:00
LaMont Jones
752703251a
Merge changes from topic "product-build-flags" into main
...
* changes:
release_config: build flags can be lists
Add support for product-specific build flags
2023-11-01 16:01:08 +00:00
Jooyung Han
cebed823e8
Merge "Rewrite how to generate apexkeys.txt" into main am: aea4c9d496
am: 8fdb9fb3e3
am: de68362036
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2809200
Change-Id: I631064bd258754759f7a47a63c9741dcaf92d93b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-01 06:39:53 +00:00
Jooyung Han
de68362036
Merge "Rewrite how to generate apexkeys.txt" into main am: aea4c9d496
am: 8fdb9fb3e3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2809200
Change-Id: I0a0fbae56deb370afa23e6c573422d80ea5bafe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-01 06:00:31 +00:00
Jooyung Han
703ad8bb8a
Merge "Rewrite how to generate apexkeys.txt" into main am: aea4c9d496
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2809200
Change-Id: I277afb233909bba5b039049789a45b0ccf713f24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-01 05:35:23 +00:00
Jooyung Han
8fdb9fb3e3
Merge "Rewrite how to generate apexkeys.txt" into main am: aea4c9d496
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2809200
Change-Id: I7b4f5bf34b61effe84d8c90e62d23aac785b0b68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-01 05:33:12 +00:00
Jooyung Han
aea4c9d496
Merge "Rewrite how to generate apexkeys.txt" into main
2023-11-01 05:13:06 +00:00
Jooyung Han
8b162283f7
Rewrite how to generate apexkeys.txt
...
Instead of listing all apexes in the source tree, now each apex emits
its own fragment for apexkeys.txt, which is pointed by
LOCAL_APEX_KEYS_FILE. Makefile collects apexkeys.txt from installed apex
files. This is to avoid listing unrelated apexes (not installed,
testdata, unexported namespaces, etc.)
Bug: 304914238
Test: m apexkeys.txt
Test: m blueprint-tests
Change-Id: I6b5601609d16452a0717f09ecaa703ee09693094
2023-11-01 13:06:08 +09:00
Dan Shi
a89f3f2a52
Merge "Remove EXTRA_TEST_RUNNER_CONFIGS option in template for autogen instrumentation test" into main am: d22a5558f4
am: e4929d3cf4
am: f7e65d4f01
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2813260
Change-Id: I4154dc7219112cccb98e4e14e4e577fe49e0c4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-01 02:14:06 +00:00
Dan Shi
683703ccfa
Merge "Remove EXTRA_TEST_RUNNER_CONFIGS option in template for autogen instrumentation test" into main am: d22a5558f4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2813260
Change-Id: Id8415b905c235d6057e63fd688e4205f04f37a1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-01 01:38:57 +00:00
Dan Shi
e4929d3cf4
Merge "Remove EXTRA_TEST_RUNNER_CONFIGS option in template for autogen instrumentation test" into main am: d22a5558f4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2813260
Change-Id: I4f3ecc51041b5a1f56ccc4a76b6b52ef72725fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-01 01:08:10 +00:00
Dan Shi
042bb8c6dc
Remove EXTRA_TEST_RUNNER_CONFIGS option in template for autogen instrumentation test
...
Instrumentation test config created by autogen is still using python script
auto_gen_test_config.py, which doesn't support extra_runner_options yet.
Bug: 308627607
Test: m FrameworksCorePackageInstallerSessionsTests
Change-Id: Ib3bef791a9d1b3e0b68f5845dc20d2c5ec5791ec
2023-10-31 15:44:16 -07:00