Commit graph

83968 commits

Author SHA1 Message Date
Spandan Das
d53fcc06ce Do not rename prebuilt apexes for product packaging
https://r.android.com/2901309 added support for handling installation
rules for multiple prebuilts. One of the implementation details there
was to change LOCAL_MODULE name to the source apex name in the generated
.mk files.

This causes issues in partner builds where the google singed apex
com.google.android.foo gets renamed to com.android.foo in
out/soong/Android-$PRODUCT.mk. If the partner builds does not include
the aosp apex in its PRODUCT_PACAKGES, then the google signed apex gets
elided from packaging.

This CL undoes that change. After this CL, the name of the module as it
appears in Android.bp will match the LOCAL_MODULE name emitted for
product packaging.

Test: in build/soong, go test ./apex
Bug: 355682304
(cherry picked from https://android-review.googlesource.com/q/commit:a8e2d6173d0d83ead3e481124311ab59deced404)
Merged-In: Icadbb75609174cff5326f52baf7d53e901f9f1c0
Change-Id: Icadbb75609174cff5326f52baf7d53e901f9f1c0
2024-08-06 22:35:13 +00:00
Android Build Coastguard Worker
af2b96ca93 Merge cherrypicks of ['googleplex-android-review.googlesource.com/28537601'] into 24Q3-release.
Change-Id: Icbb9a5208c5a090d0a7eff6533eff8987d216e9c
2024-07-30 00:02:44 +00:00
Inseob Kim
7c099a6b58 Fix DISPLAY_BUILD_NUMBER
The dot was accidentally removed.

Bug: 353425495
Test: build
(cherry picked from commit 51d3a6d2d3f85ac2014f3988a1f1975fe1a1a497)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e4fa1844b15d5eeecd2417477741d9b845c74b7e)
Merged-In: Id0c08f3c98d5b2f56e49180baf98bb8847f6bebd
Change-Id: Id0c08f3c98d5b2f56e49180baf98bb8847f6bebd
2024-07-29 23:55:37 +00:00
Android Build Coastguard Worker
2f3897006d Merge cherrypicks of ['android-review.googlesource.com/3162997', 'android-review.googlesource.com/3163726'] into 24Q3-release.
Change-Id: I25eadd3b472bdd43ee9c2727f99d5f05f0d1ae68
2024-07-12 04:02:57 +00:00
Roopesh Nataraja
d34337948f Add oryon to arm64 cpu variants
Bug: 350058746
Test: builds
(cherry picked from https://android-review.googlesource.com/q/commit:826912e7d4c743c2700016b40145342e6127a370)
Merged-In: I717e035165a7529629061cbfcb076b168dc031d6
Change-Id: I717e035165a7529629061cbfcb076b168dc031d6
2024-07-12 03:44:11 +00:00
Colin Cross
f1cc40e272 Relax cflag checks for -Xclang and -target*
Allow flags in cflags that start with "-target".

Allow "-Xclang <arg>" in cflags.

Bug: 350058746
Test: builds
Flag: EXEMPT bugfix
(cherry picked from https://android-review.googlesource.com/q/commit:7c4a40a2f611e049f15e69f59df9f6ec7aaf4565)
Merged-In: I1bf64268047949d747f53d8b111fc26298aee958
Change-Id: I1bf64268047949d747f53d8b111fc26298aee958
2024-07-12 03:43:55 +00:00
Android Build Coastguard Worker
f3a42c8e08 Merge cherrypicks of ['android-review.googlesource.com/3160716'] into 24Q3-release.
Change-Id: I3d1fe188748cfdb8fae067e6eb9ec5cd64cb88f5
2024-07-10 05:23:33 +00:00
Alyssa Ketpreechasawat
02774e8a88 Add option to override defaultManifestVersion for app.
Add an option to override defaultManifestVersion using environment
variable. With this environment variable, the mainline developer will be able to locally customize the app version to higher version and install it to target devices. This is also helpful as a workaround to adjust app/apex version for coverage build (e.g. 3520 to 3500) and allow the installation of app/apex from mainline release branch (e.g. 3508) onto it. This functionality already existed for apex, so we are extending to the app.

Test: 347735412
Bug: 350986287
Bug: 347735412
Test: OVERRIDE_APEX_MANIFEST_DEFAULT_VERSION=990090000 m
Test: adb shell pm list packages --show-versioncode
(cherry picked from https://android-review.googlesource.com/q/commit:ee8b44e72a3c875b983ca4f57d65fae906d949ab)
Merged-In: I58259fe781ca121ba4067f308f1744d80c1c2d48
Change-Id: I58259fe781ca121ba4067f308f1744d80c1c2d48
2024-07-10 05:08:42 +00:00
Android Build Coastguard Worker
84ee079586 Merge cherrypicks of ['android-review.googlesource.com/3132469'] into 24Q3-release.
Change-Id: I04fa6f597cc1a6ed1623d52691f95c7d98ed7491
2024-06-21 03:35:48 +00:00
Maciej Żenczykowski
256fb00278 Revert "Enable -Wfortify-source"
This reverts commit ca5e3eb407.

Reason for revert: falcon and seahawk build failures on git_main.
(cherry picked from https://android-review.googlesource.com/q/commit:32e35e416ecc8c297ed761bcd1e6cdcc96a76ac6)
Merged-In: Ib48e33dbb1649641223013739bb85934342a067a
Change-Id: Ib48e33dbb1649641223013739bb85934342a067a
2024-06-21 03:17:55 +00:00
Android Build Coastguard Worker
7e76719028 Snap for 11976889 from 89234715c4 to 24Q3-release
Change-Id: I17ddaf0e0f688a878959c2ff8f4e1581d92407f8
2024-06-16 23:36:33 +00:00
Aditya Kumar
89234715c4 Enable -Wfortify-source am: ca5e3eb407 am: 2ac2966a57
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3107458

Change-Id: Ie07d8a9bdfcb91ea8e9879096677eb516439d009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-16 19:12:17 +00:00
Aditya Kumar
2ac2966a57 Enable -Wfortify-source am: ca5e3eb407
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3107458

Change-Id: I6477f33004ec494666cd948b33f04587c69fe788
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-16 19:03:48 +00:00
Android Build Coastguard Worker
94287ec7ee Snap for 11975806 from be0f95b374 to 24Q3-release
Change-Id: I9e762f31971c4bf692a091c1d7b0f36e55725cd5
2024-06-15 21:00:26 +00:00
Aditya Kumar
ca5e3eb407 Enable -Wfortify-source
This reverts commit 885f2eec3c.

Reason for revert: Fixed the error reported in post-submit

Change-Id: I152494403e6d6937413d0e5d2637d426c2f54009
2024-06-15 12:07:06 +00:00
Android Build Coastguard Worker
7ec179513d Snap for 11973804 from efe843b319 to 24Q3-release
Change-Id: Ie1f1f9555e0fff90981624cac9e575bafc09300f
2024-06-15 01:00:40 +00:00
Cole Faust
be0f95b374 Merge "Remove saveToBazelConfigFile" into main am: ba80e4c16b am: 2ce7466a03
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3132087

Change-Id: I91a4d8f8017d3a81536619eb436d42427db48918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 23:35:40 +00:00
Cole Faust
2ce7466a03 Merge "Remove saveToBazelConfigFile" into main am: ba80e4c16b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3132087

Change-Id: I4606bb743cab751bd9411871806b92be8fcbbd41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 23:27:54 +00:00
Cole Faust
ba80e4c16b Merge "Remove saveToBazelConfigFile" into main 2024-06-14 23:23:58 +00:00
Zi Wang
0904c70b44 Merge "Add another way for TestingModule to get its output files" into main am: f222db3d01 am: 507d139799
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3132916

Change-Id: Ic8aedc6e5e81c2155031a10d322f281503fbf1ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 22:32:15 +00:00
Zi Wang
507d139799 Merge "Add another way for TestingModule to get its output files" into main am: f222db3d01
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3132916

Change-Id: I716cc3193bc96da919bfcee3125f5f2812c3a40c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 22:23:25 +00:00
Zi Wang
f222db3d01 Merge "Add another way for TestingModule to get its output files" into main 2024-06-14 22:14:59 +00:00
Pirama Arumuga Nainar
76eb67cb84 Merge "Revert^4 "Enable full LTO optimization by default"" into main am: 52436e1574 am: d9e2ed44c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3016322

Change-Id: Id2be7127dcee0d8e17d088295f95af28cf255f45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 22:08:11 +00:00
Pirama Arumuga Nainar
d9e2ed44c1 Merge "Revert^4 "Enable full LTO optimization by default"" into main am: 52436e1574
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3016322

Change-Id: I32aee6e174f19687791aba4b83e058063986513e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 22:01:35 +00:00
Pirama Arumuga Nainar
52436e1574 Merge "Revert^4 "Enable full LTO optimization by default"" into main 2024-06-14 21:54:50 +00:00
Cole Faust
fb3f87f519 Merge "Remove debug/release cflags" into main am: 7dc42aa7af am: 25c7781a5f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3131536

Change-Id: If72953cf0240a0c3c21002cfbb9a84642f290cb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 21:28:07 +00:00
Cole Faust
25c7781a5f Merge "Remove debug/release cflags" into main am: 7dc42aa7af
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3131536

Change-Id: Ia36b210486ca3067d4875b2a152868d8c3e95d1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 21:20:26 +00:00
Cole Faust
7dc42aa7af Merge "Remove debug/release cflags" into main 2024-06-14 21:15:15 +00:00
Cole Faust
ad18649d29 Remove saveToBazelConfigFile
Bug: 315353489
Test: Presubmits
Change-Id: I781f0fd9d0241b9742b0b84f5df4088e7bba16c7
2024-06-14 14:13:54 -07:00
Cole Faust
efe843b319 Merge "Simplify aconfig_declarations_group" into main am: 791733fad4 am: 4ec136ab8f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3133934

Change-Id: I48d0ddb19e76ab9118b661549c305d8f345111ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 20:35:13 +00:00
Cole Faust
4ec136ab8f Merge "Simplify aconfig_declarations_group" into main am: 791733fad4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3133934

Change-Id: I67347a05a412b2a335bc9878b35da530e93f7cde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 20:27:52 +00:00
Cole Faust
791733fad4 Merge "Simplify aconfig_declarations_group" into main 2024-06-14 20:25:40 +00:00
Treehugger Robot
607f9f88c3 Merge "Add test for AppendSimpleValue" into main am: dcde7e260c am: 8117d86db8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3132953

Change-Id: I4b4a43e62333160df8848606c7a6cb4f47f1a973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 18:42:09 +00:00
Treehugger Robot
8117d86db8 Merge "Add test for AppendSimpleValue" into main am: dcde7e260c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3132953

Change-Id: I9a6426f1c4d7494d52c30b80f657674d341036e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 18:33:08 +00:00
Treehugger Robot
dcde7e260c Merge "Add test for AppendSimpleValue" into main 2024-06-14 18:28:03 +00:00
Cole Faust
779d41cf7c Simplify aconfig_declarations_group
Some of the getters were unused, which means that all the fields
could be made into local variables.

Test: m nothing --no-skip-soong-tests
Change-Id: Iea38ed7f9da952803f54194c0c5a8fda9b6007f5
2024-06-14 11:17:48 -07:00
mrziwang
e81e77a2b1 Add another way for TestingModule to get its output files
In OutputFiles method, TestingModule is able to get its own output
files by reading its module base property. If the TestingModule
never updates its outputFiles property, it will fall back to use the OutputFileProducer interface.

Only empty string tag case is added in this CL since all the testing modules are getting the output files using empty string tag.

Test: CI
Bug: 339477385
Change-Id: I3009ae45d8d909653e3b6b222bced9ccabbaede7
2024-06-14 11:09:54 -07:00
Treehugger Robot
7361f9bb97 Merge "Only write release config files if they've changed" into main am: 7467410787 am: f067601a35
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3132915

Change-Id: Icf372220dd0f8eb9899619920739e94633c44143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 17:59:51 +00:00
Treehugger Robot
f067601a35 Merge "Only write release config files if they've changed" into main am: 7467410787
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3132915

Change-Id: I31ac2ea835e3edc8ab0a7de578c95a4c8520ca2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 17:54:27 +00:00
Treehugger Robot
7467410787 Merge "Only write release config files if they've changed" into main 2024-06-14 17:49:23 +00:00
Aleks Todorov
e81e225be1 Merge "cc: Make generated_headers configurable" into main am: 274b3c9521 am: 23c2f28987
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3131597

Change-Id: I1048966516b0cdc8115fcc4e43978a6ac516f114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 17:37:26 +00:00
Aleks Todorov
23c2f28987 Merge "cc: Make generated_headers configurable" into main am: 274b3c9521
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3131597

Change-Id: Ia025399a37421c347c263f0534e8c3462548810e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 17:29:59 +00:00
Aleks Todorov
9735034583 Merge "cc: Make cc_genrule defaultable" into main am: 36187c371e am: a6b0c47ed5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3131758

Change-Id: I6dfa1b1fa378190c2d974f7efa82e05d70e0f942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 17:29:33 +00:00
Aleks Todorov
274b3c9521 Merge "cc: Make generated_headers configurable" into main 2024-06-14 17:25:07 +00:00
Aleks Todorov
a6b0c47ed5 Merge "cc: Make cc_genrule defaultable" into main am: 36187c371e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3131758

Change-Id: I7483f90d69cec43463b1852e57b59be725b17be1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 17:23:34 +00:00
Aleks Todorov
36187c371e Merge "cc: Make cc_genrule defaultable" into main 2024-06-14 17:17:17 +00:00
Aleks Todorov
93b6dd0036 cc: Make generated_headers configurable
Bug: 325444956
Test: m
Test: m [custom target with select() in generated_headers]
Change-Id: I95c9aa52be39e0f5afb503f0b71bce222961ec92
2024-06-14 16:56:38 +01:00
PODISHETTY KUMAR
065f23644e Merge "Revert "Pass --non-updatable-system flag to aapt2 when versionCode is unspecified"" into main am: fc7677874a am: 58d5327fbb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3133475

Change-Id: I6c94ea52af25f801b11b0de72a92e5ccb2214530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 13:43:30 +00:00
PODISHETTY KUMAR
58d5327fbb Merge "Revert "Pass --non-updatable-system flag to aapt2 when versionCode is unspecified"" into main am: fc7677874a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3133475

Change-Id: I03a00bfb541769e6aa877a184ce7efa2a03d0f59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 13:38:03 +00:00
PODISHETTY KUMAR
fc7677874a Merge "Revert "Pass --non-updatable-system flag to aapt2 when versionCode is unspecified"" into main 2024-06-14 13:30:06 +00:00