Commit graph

99285 commits

Author SHA1 Message Date
Zhuoyao Zhang
001cdbf26b Merge "Support tool event logging for fastboot" into main am: 9a74753a84 am: e67102e2e1
Original change: https://android-review.googlesource.com/c/platform/build/+/3123151

Change-Id: Ia756abbc561d87ecf0fa84c0b64e543a34220d14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 18:43:02 +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
Steven Moreland
cffced3727 zipalign: succesful -> successful
Bugs: me
Change-Id: I6cc866b3d8765ed6ef553f2de80bba995bdbc095
Test: n/a
2024-06-11 17:07:44 +00:00
Sorin Basca
73ba79702e Allow experimental use of Java 21 by default in makefiles
Bug: 342332820
Test: EXPERIMENTAL_TARGET_JAVA_VERSION_21=true m javac-check lint-check dist
Change-Id: I510746d617c49a0423f1ab0171a3474b181c3875
2024-06-11 14:30:39 +01:00
Mårten Kongstad
c87770e242 Merge changes from topic "check-flagged-apis-list-subcommand" into main am: ac9a2abad8 am: 21d8395879
Original change: https://android-review.googlesource.com/c/platform/build/+/3121994

Change-Id: I5a73f3e79f9ef92caf7dc291ced4db0cb6b8ddfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 13:06:22 +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
Lance Chang
7c282854f3 Change TARGET_BUILD_APPS_WITH_BUILD_NUMBER to a product variable
This change allows unbundled app builds to embed the build number in the
version name by defining PRODUCT_BUILD_APPS_WITH_BUILD_NUMBER, so that
APK files from a build can be easily identified.

Ignore-AOSP-First: changes in topics with internal-only projects
Test: manual build
Bug: 340311907
Change-Id: If7feda5eec2bc1e54a90b4adae1bd6da19e3ea45
2024-06-10 22:27:42 -07:00
Ankur Bakshi
f61420f4c1 Update Security String to 2024-08-01
Bug: 342381152

Change-Id: Iefbd1fff39d557fa352a53662d70bc734a255564
Merged-In: Iefbd1fff39d557fa352a53662d70bc734a255564
Merged-In: Ib4bd1d2496bab1fd22db8b7b362aa88631dd320a
Merged-In: I2c5897803882d448ad511596d8d1c3650c065518
Merged-In: I9edc7171d124f0cfa540fea6f0e06ba877910444
2024-06-11 04:04:45 +00:00
Android Build Coastguard Worker
c1c546a721 Make change and version bump to AP3A.240611.001
Snap for 11949167 from 4203958e68 to 24Q3-release

Change-Id: Ia732162fdd9631ee5df9239f61a336fcae380761
2024-06-10 23:50:37 +00:00
Luca Farsi
0c15e13176 Merge "Add optimized build features in build_test_suites" into main am: 6f16d9aead am: 5f359f0bb4
Original change: https://android-review.googlesource.com/c/platform/build/+/3097821

Change-Id: Ia108bab6c09f8e7019e6523e50754f4e49e7a02d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-10 23:30:38 +00: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
Android Build Coastguard Worker
90ada2d96d [coastguard skipped] Merge sparse cherrypicks from sparse-11945331-L10500030004449972 into 24Q3-release.
COASTGUARD_SKIP: I4d0a11433404f8b1be06bb32ec221023ce68c0b5

Change-Id: Icfdbca494b2f343e4a65a71804a1bf8efc6d8f05
2024-06-10 19:51:27 +00:00
Android Build Coastguard Worker
93fe818dd1 Version bump to AP3A.240607.004.A2 [core/build_id.mk]
Change-Id: I4d0a11433404f8b1be06bb32ec221023ce68c0b5
2024-06-10 19:42:24 +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
Lance Chang
4203958e68 Merge "Add build number if TARGET_BUILD_APPS_WITH_BUILD_NUMBER is defined" into main 2024-06-10 17:45:53 +00:00
Treehugger Robot
9a3900c7e9 Merge "Enable Pre-reboot Dexopt at build time." into main am: bfcac4a398 am: f8180be2bf
Original change: https://android-review.googlesource.com/c/platform/build/+/3121991

Change-Id: I74afaeea9535b05a33ff4b75ca1b09ab14ca4881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-10 16:53:29 +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
Android Build Coastguard Worker
d4138131a2 Make change and version bump to AP3A.240610.001
Snap for 11946224 from 6fd890a5e5 to 24Q3-release

Change-Id: I67c7d626dc58e8af8944884c5721fc0ddab8d8b4
2024-06-09 21:50:54 +00:00
Lance Chang
eda8686794 Add build number if TARGET_BUILD_APPS_WITH_BUILD_NUMBER is defined
This change allows unbundled app builds to embed the build number in the
version name by defining TARGET_BUILD_APPS_WITH_BUILD_NUMBER, so that
APK files from a build can be easily identified.

Ignore-AOSP-First: changes in topics with internal-only projects
Test: manual build
Bug: 340311907
Change-Id: I9a7e4f96f0d92c19d832933b5c68bd6b75ce9ce6
2024-06-09 13:22:58 -07:00
Android Build Coastguard Worker
757564aad2 Make change and version bump to AP3A.240609.001
Snap for 11945538 from 6fd890a5e5 to 24Q3-release

Change-Id: I8bc82ebf5f307d2c35adfa3e0b497684fe4ec139
2024-06-08 21:50:17 +00:00
Android Build Coastguard Worker
34f15f3d6a [coastguard skipped] Merge sparse cherrypicks from sparse-11944173-L29900030004348256 into 24Q3-release.
COASTGUARD_SKIP: I02883aaaa31e15737b0600f45e8cb7cd482f47a4

Change-Id: If3b00374d58890eb80a49062712b1731eee2675e
2024-06-08 08:43:27 +00:00
Android Build Coastguard Worker
3656710da9 Version bump to AP3A.240607.004.A1 [core/build_id.mk]
Change-Id: I02883aaaa31e15737b0600f45e8cb7cd482f47a4
2024-06-08 08:42:14 +00:00
Treehugger Robot
6fd890a5e5 Merge "Add license metadata declaration in device/generic/goldfish" into main am: a96b36bd9f am: fc9567c25b
Original change: https://android-review.googlesource.com/c/platform/build/+/3113262

Change-Id: I32983f131d32c1519e52daba6f7b879c3fa17ff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-08 02:42:57 +00: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
Android Build Coastguard Worker
1064d3dd34 Make change and version bump to AP3A.240608.001
Snap for 11944020 from 55b92a6726 to 24Q3-release

Change-Id: I373279a62622fca645db207ec334fd538e3ae93c
2024-06-08 01:51:29 +00:00
Zhuoyao Zhang
6579539668 Merge "Move the impl of run_tool_with_logging into shell_utils.sh" into main am: df1ba7c5ff am: 99d5a16cf7
Original change: https://android-review.googlesource.com/c/platform/build/+/3109346

Change-Id: Id674e385717943f4fdc23744406055a9b8ee237c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-08 01:30:48 +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
Treehugger Robot
c75273461d Merge "Add support to disable adb root on userdebug builds based on product config" into main am: 878141b810 am: 812d3e988c
Original change: https://android-review.googlesource.com/c/platform/build/+/3118597

Change-Id: I2f91943b5045dc3ac89eb1ddcec0c5e3de811f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-08 01:09:14 +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
a8fb229469 Merge "Fix expansion of _include_stack in _import-node" into main am: 7120481a00 am: e48e393a12
Original change: https://android-review.googlesource.com/c/platform/build/+/3119358

Change-Id: Ic1b29682425660bd6d975e7ea9e11f1a2affb8a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 23:56:33 +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
Zhuoyao Zhang
de884897d1 Merge "Remove run_tool_with_logging function from envsetup.sh" into main am: 997c0b3b77 am: 40fb1dab24
Original change: https://android-review.googlesource.com/c/platform/build/+/3096107

Change-Id: Ia9e4314bc6747804f958c37a84c107aadba5d5a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 23:02:06 +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
Android Build Coastguard Worker
f99bbd39c1 Version bump to AP3A.240607.004 [core/build_id.mk]
Change-Id: I80d8f14a5f2169c72a87d98d75ccb0afbd290fab
2024-06-07 22:29:34 +00:00
Spandan Das
653237c2a4 Merge "Prevent implicit outputs created during dexpreopt_config.zip" into main am: d7c448f0f7 am: cc4e318dce
Original change: https://android-review.googlesource.com/c/platform/build/+/3117879

Change-Id: I505bb16d818082d2abd62a0e278f10d2d1110713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 22:06:35 +00:00