Commit Graph

83476 Commits

Author SHA1 Message Date
Priyanka Advani
58b978f11d Merge "Revert "Set strict_mode to true"" into main 2024-05-30 18:39:01 +00:00
Kevin Liu
6a20769a50 Revert "Set strict_mode to true"
Revert submission 27234948-default_strict_mode

Reason for revert: b/343559188
Reverted changes: /q/submissionid:27234948-default_strict_mode

Change-Id: Ib06e3d269e606477d5e8f8acc9a26ebf332447a8
2024-05-30 18:20:25 +00:00
Spandan Das
844de9d480 Merge "Override modules should always override source modules" into main am: 2f9af23734 am: e0063f7f10
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3106441

Change-Id: I3344c16f7cff3c5a2a763493536c92bd18e48f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:58:22 +00:00
Jiyong Park
5c34582453 Merge "Required deps don't track native bridge architectures" into main am: a03e16f1b9 am: 1d6f33918d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3105117

Change-Id: Ic861534533f677c00112d53dc33dba2a3b43de6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:57:39 +00:00
Treehugger Robot
b700e55760 Merge "Use r8/d8 optimized profile for dexpreopt" into main am: 8723705fad am: b18a30edde
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3095860

Change-Id: I67a2cc8d84fd930a20f6113a302f604eb53fa3f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:55:41 +00:00
Liana Kazanova
aec20cb71c Merge "Revert "Enable -Wfortify-source"" into main am: f820c3beda am: 8f3a8099f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3107457

Change-Id: If390e568322ae6126579dd63bd854cb3efdb4b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:39:41 +00:00
Treehugger Robot
bdf8b61b90 Merge "Build build_flags.json in soong" into main am: 89341ed9ad am: fe69b391f2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3011253

Change-Id: Ie0e1c55ec6bced378ad3b1692a73a31223ee7133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:30:10 +00:00
Treehugger Robot
b5d52bea91 Merge "Update build to handle documentation issues being errors" into main am: 1705676dd0 am: b61caca9d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3106478

Change-Id: I50bc06d9dea2a113ed0defd8b3871dae03d097a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:11:43 +00:00
Aditya Kumar
65e66abe4a Merge "Enable -Wfortify-source" into main am: 3775725af2 am: 7f8190b9d2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3102042

Change-Id: I1420e6b9253ab3d46b42c0370827763bcbe99047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:07:48 +00:00
LaMont Jones
843c767821 all_flags.pb: Properly handle intermediate files am: 194d492d55 am: c415968b67
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3106680

Change-Id: I0923074cb2d6e99c2fa25a52dd1d2b7c58c7562b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:01:07 +00:00
Automerger Merge Worker
9c7bbc70b6 Merge "[automerger skipped] Mark 2024-06 Release (ab/AP2A.240605.024) as merged in aosp-main-future am: 063b79282b -s ours" into main 2024-05-29 21:56:19 +00:00
Xin Li
f80276ddb2 [automerger skipped] Mark 2024-06 Release (ab/AP2A.240605.024) as merged in aosp-main-future am: 063b79282b -s ours
am skip reason: Merged-In Ib03492fabd62bee36f8c67b698767e710fe0b822 with SHA-1 261d373ad1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/27547895

Change-Id: Id3cfbec1018144fa2b4567a0705a4a10f08b6184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:55:51 +00:00
Xin Li
cf7832a23f [automerger skipped] Mark 2024-06 Release (ab/AP2A.240605.024) as merged in aosp-main-future am: 063b79282b -s ours
am skip reason: Merged-In Ib03492fabd62bee36f8c67b698767e710fe0b822 with SHA-1 261d373ad1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/27547895

Change-Id: If4160cdb7697cb1585f390ea402fa9922cc006da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:55:48 +00:00
yangbill
a8fb085106 Allow required property be conditional for release_aidl_use_unfrozen am: 585564cab2 am: 65966d29a4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3099338

Change-Id: Id75755b06fd2ea72108f0aebf07d1e5e6fe70aa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:54:30 +00:00
Kiyoung Kim
1838595ad8 Merge "Remove VndkUseCoreVariant related code from build" into main am: 60cec95e01 am: f204f58469
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3102677

Change-Id: I64306d029ba179d51d6ece51089eeb258a288ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:54:06 +00:00
Joe Onorato
dda04d393e get_build_var and get_abs_build_var are now scripts am: 5a62e76561 am: 1722070bed
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3101802

Change-Id: Ic2ef363e588e417284bb8630f439e1131260d5df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:53:28 +00:00
Joe Onorato
56bd68ca39 More envsetup.sh cleanup -- move these to standalone scripts am: ded5d2de15 am: b5a206685d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3101801

Change-Id: I975776f5892c777120e1148f91e8f23aa91c9a49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:53:23 +00:00
Joe Onorato
297f9b62ec build/soong side of move the module-info.json commands into standalone scripts. am: d636ea12bf am: 0cdc6f963b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3101800

Change-Id: I98c959349aa9ed75b4790ce7ce3ecafee3203f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:53:19 +00:00
Treehugger Robot
ca4f13e33c Merge "Convert some properties to Configurable properties" into main am: c6b5fdbc5c am: 655c526ec2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3095915

Change-Id: Ia0c137117516024f6ebe462532373323d5adc56b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:52:33 +00:00
Xin Li
3e34e74b65 [automerger skipped] Merge "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future" into aosp-main-future am: 547e0ebfc5 -s ours
am skip reason: Merged-In I4a6dd1c5e48db7085ea41035def31f0844948a46 with SHA-1 2150160d8f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/27273838

Change-Id: I85d9215a1022be929c4ee0eafe5f82c2258a22e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 20:53:05 +00:00
Xin Li
46465c0a1a [automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 8a31520ef8 -s ours
am skip reason: Merged-In I4a6dd1c5e48db7085ea41035def31f0844948a46 with SHA-1 2150160d8f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/27273838

Change-Id: I99a6e010b7b676c20710227fcc7cdd2de9793297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 20:49:36 +00:00
Spandan Das
e0063f7f10 Merge "Override modules should always override source modules" into main am: 2f9af23734
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3106441

Change-Id: Ib33a4421e62c94bb426d1ef46c2e5f9312b78a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 16:45:57 +00:00
Spandan Das
2f9af23734 Merge "Override modules should always override source modules" into main 2024-05-29 16:25:45 +00:00
Jiyong Park
1d6f33918d Merge "Required deps don't track native bridge architectures" into main am: a03e16f1b9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3105117

Change-Id: I72e6bb88e1a66b604a9ccc59d84a664bcbce0fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 04:20:24 +00:00
Jiyong Park
a03e16f1b9 Merge "Required deps don't track native bridge architectures" into main 2024-05-29 03:59:58 +00:00
LaMont Jones
a2b1af73ae all_flags.pb: Properly handle intermediate files am: 4ba41f0eff
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/27562191

Change-Id: I2649c9dfc715a353ffd74a5988bc7165028547d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 03:38:31 +00:00
LaMont Jones
dbe9628d7c [automerger skipped] Generate specific message for build flag declarations artifact am: a2cbf72b2a -s ours
am skip reason: Merged-In I00eab1ef76f67f7db2118a6fc0d5771e3dd39fbb with SHA-1 6d9ff256ed is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/27562190

Change-Id: I6b1a278a38fdf51a047831352e1d348c69cef2e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 03:38:28 +00:00
LaMont Jones
6ba0eb39f1 [automerger skipped] release_config_proto: revert enum rename am: d2c2f4091c -s ours
am skip reason: Merged-In I53dc5045839b575e5fcaace39a435c28648010f6 with SHA-1 44789260ad is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/27562189

Change-Id: Idc5524b2c0a29694b799dd99cd933b4ca10376a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 03:38:25 +00:00
LaMont Jones
e56b5e0fc2 [automerger skipped] Better errors from build-flag am: 2f75608ebc -s ours
am skip reason: Merged-In If4dc13e0e895823f50de1f5c7e929bb05eac69a0 with SHA-1 310ccc2ad2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/27562188

Change-Id: I81ab1918ee952dd79cc2feac39f522f424a7bbce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 03:38:22 +00:00
LaMont Jones
e1dd6dce77 [automerger skipped] Minor flagging cleanup am: 51cee24d6d -s ours
am skip reason: Merged-In I6b1d6dcd0aff3c82551021b3f4768a34f27d6fb2 with SHA-1 52df388f5a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/27562187

Change-Id: Ice4d32b63651d5c4a07e744897bcb0946d157766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 03:38:19 +00:00
LaMont Jones
09b1fb6dbd [automerger skipped] Add build_flag_declarations module am: 0a9b643c6e -s ours
am skip reason: Merged-In I97eb864e2d84bc606fef7e9077554894338edaa0 with SHA-1 c6aef16816 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/27562186

Change-Id: I77071fb06dd2c077e5f0d72475587f522c7ee122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 03:38:16 +00:00
LaMont Jones
704ec1bd94 [automerger skipped] Add build-flag-declarations tool am: 705536a149 -s ours
am skip reason: Merged-In I155c26b1442347c4d433c9cbf22b94d944636702 with SHA-1 fa4ba22a41 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/27562185

Change-Id: I80c30426fd7c6d4ddc8b126aa2048b1fd56da7fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 03:38:10 +00:00
LaMont Jones
cfa02069ec [automerger skipped] Add Factory methods, WriteFormattedMessage am: 3ca687a157 -s ours
am skip reason: Merged-In I8b3c1e1e7ea3e52e9e7e8b1f8162fedd3e83dd33 with SHA-1 e3de5ac6d0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/27562184

Change-Id: I97d2cceeedf4177afb95ad5ae098a51b865a4c1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 03:38:04 +00:00
Treehugger Robot
b18a30edde Merge "Use r8/d8 optimized profile for dexpreopt" into main am: 8723705fad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3095860

Change-Id: Ifc3c21a58ff94bf7ece2a23b1f66c35eb7e51872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 02:33:11 +00:00
Treehugger Robot
8723705fad Merge "Use r8/d8 optimized profile for dexpreopt" into main 2024-05-29 02:15:37 +00:00
Spandan Das
3dbda18e80 Use r8/d8 optimized profile for dexpreopt
Currently, dexpreopt supports profile guided optimization. This does not
work well with r8/d8 optimization, since the checked-in profile will not
match the dex signatures after r8/d8 has optimized the dex code.

This CL introduces a new property `dex_preopt.enable_profile_rewrting`.
If set, the checked-in profile will passed as `input` to r8 via
`--art-profile <input> <output>`. The <output> from the previous command
will be used as the profile for dexpreopt.

Test: m nothing --no-skip-soong-tests
Test: m CredentialManager with https://ag.corp.google.com/27448930
and obfuscation turned on
Test: nm -U symbol.odex # contains obfuscated methods

Bug: 335418838

Change-Id: I53beed9ed76f013262f1c503de0f2b74997c2a7f
2024-05-29 01:05:05 +00:00
Liana Kazanova
8f3a8099f8 Merge "Revert "Enable -Wfortify-source"" into main am: f820c3beda
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3107457

Change-Id: Ibf7668666d3436fb93f290c73c4bb3b70423b8a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 00:35:01 +00:00
Treehugger Robot
fe69b391f2 Merge "Build build_flags.json in soong" into main am: 89341ed9ad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3011253

Change-Id: I6b08c21772d3611356968b442eb0e9ed734a93e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 00:34:36 +00:00
Liana Kazanova
f820c3beda Merge "Revert "Enable -Wfortify-source"" into main 2024-05-29 00:26:24 +00:00
Treehugger Robot
89341ed9ad Merge "Build build_flags.json in soong" into main 2024-05-29 00:18:16 +00:00
Spandan Das
0b28fa0b84 Override modules should always override source modules
Since overrides are implemented as variants of the source module, the
override module should not be replaced with prebuilts of the source
module even when the prebuilt is preferred.

Test: go test ./apex
Change-Id: I26e97f700276e7beaf6d1bd61b164f11d57a5e09
2024-05-29 00:06:32 +00:00
Liana Kazanova
885f2eec3c Revert "Enable -Wfortify-source"
This reverts commit 5735ef6777.

Reason for revert: DroidMonitor: Potential culprit for b/343287447 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I1aeeddc251db760e2ab01c734733d351514ec5b0
2024-05-28 23:33:24 +00:00
LaMont Jones
4ba41f0eff all_flags.pb: Properly handle intermediate files
Bug: 343203557
Test: manual, TH
Ignore-AOSP-First: cherry-pick
Merged-In: I9a4ef39b0c2a641ccd996187ce5f7629520dffc0
Change-Id: I9a4ef39b0c2a641ccd996187ce5f7629520dffc0
2024-05-28 16:23:34 -07:00
LaMont Jones
a2cbf72b2a Generate specific message for build flag declarations artifact
Many of the fields in `flag_artifact` are not valid in
the all_build_flag_definitions artifact.

Bug: 328495189
Test: manual
Ignore-AOSP-First: cherry-pick
Merged-In: I00eab1ef76f67f7db2118a6fc0d5771e3dd39fbb
Change-Id: I00eab1ef76f67f7db2118a6fc0d5771e3dd39fbb
2024-05-28 16:21:33 -07:00
LaMont Jones
d2c2f4091c release_config_proto: revert enum rename
This caused the existing textproto files to be misparsed.

Bug: 328495189
Test: manual
Ignore-AOSP-First: cherry-pick
Merged-In: I53dc5045839b575e5fcaace39a435c28648010f6
Change-Id: I53dc5045839b575e5fcaace39a435c28648010f6
2024-05-28 16:21:25 -07:00
LaMont Jones
2f75608ebc Better errors from build-flag
When `get_build_var` fails, output the error.

Bug: none
Test: manual
Ignore-AOSP-First: cherry-pick
Merged-In: If4dc13e0e895823f50de1f5c7e929bb05eac69a0
Change-Id: If4dc13e0e895823f50de1f5c7e929bb05eac69a0
2024-05-28 16:21:16 -07:00
LaMont Jones
51cee24d6d Minor flagging cleanup
Add an underscore to make the linter more happy.

Bug: 339672075
Bug: 328495189
Test: manual
Ignore-AOSP-First: cherry-pick
Merged-In: I6b1d6dcd0aff3c82551021b3f4768a34f27d6fb2
Change-Id: I6b1d6dcd0aff3c82551021b3f4768a34f27d6fb2
2024-05-28 16:21:07 -07:00
LaMont Jones
0a9b643c6e Add build_flag_declarations module
And generate build-flags/build_flags.{pb,textproto} files

Bug: 328495189
Test: manual,TH
Ignore-AOSP-First: cherry-pick
Merged-In: I97eb864e2d84bc606fef7e9077554894338edaa0
Change-Id: I97eb864e2d84bc606fef7e9077554894338edaa0
2024-05-28 16:20:51 -07:00
LaMont Jones
705536a149 Add build-flag-declarations tool
This will be used to gather build flag declarations

Bug: 328495189
Test: manual, TH
Ignore-AOSP-First: cherry-pick
Merged-In: I155c26b1442347c4d433c9cbf22b94d944636702
Change-Id: I155c26b1442347c4d433c9cbf22b94d944636702
2024-05-28 16:20:43 -07:00
Treehugger Robot
b61caca9d4 Merge "Update build to handle documentation issues being errors" into main am: 1705676dd0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3106478

Change-Id: I8e5af23977fedacef49dab1b65923098cab99e09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-28 23:20:31 +00:00