Commit graph

98201 commits

Author SHA1 Message Date
Treehugger Robot
c17b8e9aa6 Merge "Move license metadata declaration of bramble/Android.mk into meta-lic.mk" into main am: f94c02c7f3
Original change: https://android-review.googlesource.com/c/platform/build/+/3127554

Change-Id: I3eb52390b1da643d2e28e373560bde96d35076e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 02:43:51 +00:00
Treehugger Robot
f94c02c7f3 Merge "Move license metadata declaration of bramble/Android.mk into meta-lic.mk" into main 2024-06-13 02:34:51 +00:00
Treehugger Robot
200880c0b7 Merge "Convert appcompat.sh to a Python binary" into main am: 3dcc84df5c
Original change: https://android-review.googlesource.com/c/platform/build/+/3106579

Change-Id: I5bdfde8f27751ae817596c1a1dbcb1411c31f3c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 01:06:05 +00:00
Treehugger Robot
3dcc84df5c Merge "Convert appcompat.sh to a Python binary" into main 2024-06-13 00:51:27 +00:00
Herbert Xue
5c71b1af0e Move license metadata declaration of bramble/Android.mk into meta-lic.mk
Bug: 346457924
Test: NA
Change-Id: Ie0fcb71bd3a10d54700256f3e19296a6aaac1298
2024-06-12 14:34:31 +08:00
Yihan Dong
bfcfb660e5 Merge "Add Android Media Better Together team" into main am: de53f614f4
Original change: https://android-review.googlesource.com/c/platform/build/+/3124555

Change-Id: Ie9e7a1b9ceddd608495f2317a728d9742afbebe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 06:04:30 +00:00
Yihan Dong
de53f614f4 Merge "Add Android Media Better Together team" into main 2024-06-12 05:43:44 +00:00
Yihan Dong
2880eac1a3 Add Android Media Better Together team
Bug: 342941281
Change-Id: Ib96e26fe625511bd9e9cc3086f3ff12a234dc588
Test: m noting
2024-06-12 01:16:45 +00:00
Treehugger Robot
5a648e50c9 Merge "Set widevine apex signed with dev key" into main am: 683eb4b502
Original change: https://android-review.googlesource.com/c/platform/build/+/3101237

Change-Id: I58b8a290fcbcda4ff8e3cc478ba2e3d0328f35f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 23:04:03 +00:00
Treehugger Robot
683eb4b502 Merge "Set widevine apex signed with dev key" into main 2024-06-11 22:46:44 +00:00
Kyle Zhang
cc21bf8b29 Set widevine apex signed with dev key
Bug: 341134913
Change-Id: Ied39e2a1dd4b715afc2ee4d35c18b52eabfc417f
2024-06-11 21:45:34 +00:00
Zhuoyao Zhang
e67102e2e1 Merge "Support tool event logging for fastboot" into main am: 9a74753a84
Original change: https://android-review.googlesource.com/c/platform/build/+/3123151

Change-Id: Ie688a8009cfc3f733f596a8e7906133e80dc22dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 18:20:28 +00:00
Zhuoyao Zhang
9a74753a84 Merge "Support tool event logging for fastboot" into main 2024-06-11 18:08:30 +00:00
Mårten Kongstad
21d8395879 Merge changes from topic "check-flagged-apis-list-subcommand" into main am: ac9a2abad8
Original change: https://android-review.googlesource.com/c/platform/build/+/3121994

Change-Id: I42b6876b78e9369280b2737b82c5d04233faff77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 12:51:22 +00:00
Mårten Kongstad
ac9a2abad8 Merge changes from topic "check-flagged-apis-list-subcommand" into main
* changes:
  check-flagged-apis: add list subcommand
  check-flagged-apis: extract argument names into constants
  check-flagged-apis: add support for subcommands
2024-06-11 12:29:03 +00:00
Mårten Kongstad
1692a36da7 check-flagged-apis: add list subcommand
Add a new subcommand to list all flagged APIs and corresponding flags.
This provides an overview of what flagged APIs exist in the Android
tree.

Bug: 345207706
Test: build/tools/check-flagged-apis/check-flagged-apis.sh list
Test: atest check-flagged-apis-test
Flag: EXEMPT host side tool
Change-Id: Icc224f3787480353baabbd3946f36f003f35db59
2024-06-11 13:11:28 +02:00
Luca Farsi
5f359f0bb4 Merge "Add optimized build features in build_test_suites" into main am: 6f16d9aead
Original change: https://android-review.googlesource.com/c/platform/build/+/3097821

Change-Id: I7bd8f14393a2dfd49d823834c94cd76c582d410c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-10 23:07:05 +00:00
Luca Farsi
6f16d9aead Merge "Add optimized build features in build_test_suites" into main 2024-06-10 22:44:51 +00:00
Zhuoyao Zhang
f02aadfd27 Support tool event logging for fastboot
This is part of the adte team's effort to collect metrics that help understand the bottlenecks in the Android local testing workflow.

Added a fastboot function in build/envsetup.sh which wraps the actual
fastboot binary with the logging script

Bug: 346363374
Test: source build/envsetup.sh && lunch
aosp_cf_x86_64_phone-trunk_staging-userdebug && fastboot --version
tested in both bash and zsh

Change-Id: Ia8d29b4323b64f9f853ee096728993096d7babe9
2024-06-10 18:28:25 +00:00
Treehugger Robot
f8180be2bf Merge "Enable Pre-reboot Dexopt at build time." into main am: bfcac4a398
Original change: https://android-review.googlesource.com/c/platform/build/+/3121991

Change-Id: I7181149aeb5beda5a8290df959e0d313cabb9b41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-10 16:36:08 +00:00
Treehugger Robot
bfcac4a398 Merge "Enable Pre-reboot Dexopt at build time." into main 2024-06-10 15:59:29 +00:00
Mårten Kongstad
576e818880 check-flagged-apis: extract argument names into constants
Extract the command line argument names (and help texts) into constants.
This will allow future subcommands to re-use the same names and keep
things consistent.

Bug: 345207706
Test: atest check-flagged-apis-test
Flag: EXEMPT host side tool
Change-Id: I430f36c99f28aab8511a357f572086ee238d653b
2024-06-10 16:26:17 +02:00
Mårten Kongstad
d5ce20fc07 check-flagged-apis: add support for subcommands
The tool currently only supports a single subcommand, the "check"
command. Follow-up CLs will add new subcommands.

Bug: 345207706
Test: build/tools/check-flagged-apis/check-flagged-apis.sh
Flag: EXEMPT host side tool
Change-Id: I1aaaf313db8a10a7427aab378aac8d946d5a8a3d
2024-06-10 16:26:16 +02:00
Jiakai Zhang
28618cfff8 Enable Pre-reboot Dexopt at build time.
Bug: 311377497
Test: m
Change-Id: I48933eadea8be1d81e7c4ce37abb5a2175402236
2024-06-10 15:11:07 +01:00
Treehugger Robot
fc9567c25b Merge "Add license metadata declaration in device/generic/goldfish" into main am: a96b36bd9f
Original change: https://android-review.googlesource.com/c/platform/build/+/3113262

Change-Id: I27d42d389336a7fd2edb7f3b08a7f75a3c971f8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-08 02:24:47 +00:00
Treehugger Robot
a96b36bd9f Merge "Add license metadata declaration in device/generic/goldfish" into main 2024-06-08 02:07:02 +00:00
Zhuoyao Zhang
99d5a16cf7 Merge "Move the impl of run_tool_with_logging into shell_utils.sh" into main am: df1ba7c5ff
Original change: https://android-review.googlesource.com/c/platform/build/+/3109346

Change-Id: Ia92e745c9f0b861972979e76cd46ef1c1add28be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-08 01:16:20 +00:00
Zhuoyao Zhang
df1ba7c5ff Merge "Move the impl of run_tool_with_logging into shell_utils.sh" into main 2024-06-08 00:53:08 +00:00
Treehugger Robot
812d3e988c Merge "Add support to disable adb root on userdebug builds based on product config" into main am: 878141b810
Original change: https://android-review.googlesource.com/c/platform/build/+/3118597

Change-Id: Idc6a114fa58a832dac67000489c97d00ae1a4975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-08 00:46:16 +00:00
Treehugger Robot
878141b810 Merge "Add support to disable adb root on userdebug builds based on product config" into main 2024-06-08 00:26:20 +00:00
Treehugger Robot
e48e393a12 Merge "Fix expansion of _include_stack in _import-node" into main am: 7120481a00
Original change: https://android-review.googlesource.com/c/platform/build/+/3119358

Change-Id: I8d0014c551d42be8cf3e81cd23e6b1378314dd12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 23:42:17 +00:00
Joe Onorato
d4b4224e02 Add support to disable adb root on userdebug builds based on product config
Test: manually verify
Bug: 345480978
Change-Id: I00cf7d30f66137055ed0aa495bf3d98143c391b7
2024-06-07 16:24:06 -07:00
Treehugger Robot
7120481a00 Merge "Fix expansion of _include_stack in _import-node" into main 2024-06-07 23:22:22 +00:00
Joe Onorato
1f6eddbc35 Move the impl of run_tool_with_logging into shell_utils.sh
- This lets other shell scripts use it without being a shell function
- Simplifies run_tool_with_logging which is now in build/soong/bin

Bug: 340648588
Test: atest run_tool_with_logging
Change-Id: I1c1c5c1b115f155929c027c2ea82df5da8b190de
2024-06-07 22:54:41 +00:00
Zhuoyao Zhang
40fb1dab24 Merge "Remove run_tool_with_logging function from envsetup.sh" into main am: 997c0b3b77
Original change: https://android-review.googlesource.com/c/platform/build/+/3096107

Change-Id: Ia5825f0fe420202c446ffc0276cd594e57e3f888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 22:46:15 +00:00
Zhuoyao Zhang
997c0b3b77 Merge "Remove run_tool_with_logging function from envsetup.sh" into main 2024-06-07 22:33:20 +00:00
Luca Farsi
040fabea76 Add optimized build features in build_test_suites
Add the optimized build feature in build_test_suites. WIP

Test: WIP
Bug: 342264003
Change-Id: I05a4ac4026c345f7ced771aa6deb1b6d1c38705c
2024-06-07 15:01:18 -07:00
Spandan Das
cc4e318dce Merge "Prevent implicit outputs created during dexpreopt_config.zip" into main am: d7c448f0f7
Original change: https://android-review.googlesource.com/c/platform/build/+/3117879

Change-Id: I5043fae20d7b533fe8fa4d1de1aa345c27c2a63f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 21:51:03 +00:00
Rashid Zaman
7a29da75fe Fix expansion of _include_stack in _import-node
During product configuration after a subgraph has been fully imported,
i.e. a makefile and all makefiles it inherits from have been imported,
the makefile representing the root node of this subgraph is meant to be
removed from _include_stack in the _import-node macro via the call to
the wordlist function. Instead, _include_stack is being cleared because
the last argument to the wordlist function is escaped so when it is
expanded before being passed to wordlist instead of expanding to the
value of _include_stack the reference to _include_stack is unescaped.
Fix this by removing the escaping of the variable reference.

This issue has no impact on product configuration but the correct value
of _include_stack helps when debugging product configuration because,
for example, the dumpconfig generated by 'product-config' contains the
value of _include_stack when nodes are imported.

Bug: 345709996
Test: lunch aosp_cf_x86_64_phone-trunk_staging-userdebug && \
  m nothing shows no change to build.ninja files
Test: Run product-config and dumpconfig.csv shows correct include
  stack, e.g. for telephony_product.mk

Change-Id: I5a9b22fffc147ceea3d49e298b1bbad45f71332c
Signed-off-by: Rashid Zaman <rashidz@meta.com>
2024-06-07 14:46:16 -07:00
Spandan Das
d7c448f0f7 Merge "Prevent implicit outputs created during dexpreopt_config.zip" into main 2024-06-07 21:28:44 +00:00
Spandan Das
d9d72c46ba Prevent implicit outputs created during dexpreopt_config.zip
$PRODUCT_OUT/dexpreopt_config.zip is created by zipping all the
dexpreopt configs of individual apps. These config files are created in
$PRODUCT_OUT/dexpreopt_config, and this dir is as used as -C for
soong_zip.

In the current implementation, this build action also implicitly copies
global configuration files dexpreopt.config and dexpreopt_soong.config
into $PRODUCT_OUT/dexpreopt_config with the intent of being included in
the resultant zip file. These implicit outputs are unknown to ninja.

This CL prevents creation of these implicit outputs.
out/soong/dexpreopt_soong.config and
out/soong/dexpreopt_<arch>/dexpreopt.config is now passed directly to
soong_zip via -f.

Bug: 333316620
Test: m out/target/product/vsoc_x86_64/dexpreopt_config.zip # no longer
bit identical since the relative order changes, dexpreopt(_soong).config
now appears at the bottom of the zip
Test: zipcmp dexpreopt_config.zip.before dexpreopt_config.zip.after # no
diffs

Change-Id: Ib30c9a5c436e263231f9688129ab94664277b841
2024-06-07 17:45:19 +00:00
Treehugger Robot
4401accfe0 Merge "Build build_flags.json in soong" into main am: 04837c61f3
Original change: https://android-review.googlesource.com/c/platform/build/+/3011233

Change-Id: Ia33e4242d757bf6be4158039d5f88147ec7d99b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 05:31:15 +00:00
Treehugger Robot
04837c61f3 Merge "Build build_flags.json in soong" into main 2024-06-07 05:12:31 +00:00
Zhuoyao Zhang
1698d49b55 Remove run_tool_with_logging function from envsetup.sh
As part of the build team's effort to cleanup envseup.sh.
Remove the run_tool_with_logging rundtion from envsetup.sh and add it
as a standalone script under build/soong/bin

Test: atest run_tool_with_logging
Test: manually do source envsetup.sh and run adb devices -l and check
the event log is sent to clearcut, tested with both bash and zsh

Bug: 342066042
Change-Id: I9c23a1b0a4b5790fb32f5e84fd7421ee6b36bdb0
2024-06-06 23:53:36 +00:00
Treehugger Robot
4203b5baa7 Merge "Drop product config include tags" into main am: 27d977e49b
Original change: https://android-review.googlesource.com/c/platform/build/+/3098637

Change-Id: I2eabcd961c55645bfe4e74cf5d4f4ccf6638290e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 22:16:18 +00:00
Treehugger Robot
27d977e49b Merge "Drop product config include tags" into main 2024-06-06 22:12:38 +00:00
Xin Li
7f80af61ff Merge "Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future" into aosp-main-future 2024-06-06 20:54:34 +00:00
Vilas Bhat
c39e47f792 Merge "Propagate libpower no lock during binder transaction flag to soong" into main am: eae45e70ca
Original change: https://android-review.googlesource.com/c/platform/build/+/3107745

Change-Id: Id7c5484f3b09a6747c3d5da5338109931d968f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 04:13:37 +00:00
Vilas Bhat
eae45e70ca Merge "Propagate libpower no lock during binder transaction flag to soong" into main 2024-06-06 03:55:52 +00:00
Treehugger Robot
b8e6e297e3 Merge "Include sdk-preprocess-files.mk before process sdk.atree" into main am: 8e0ce35829
Original change: https://android-review.googlesource.com/c/platform/build/+/3113080

Change-Id: Ibff56dd869895c5bf1cb77190d91aff6e026e81b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 01:47:19 +00:00