Commit Graph

8773 Commits

Author SHA1 Message Date
Spandan Das
9e2377907d Merge changes I0edb681b,I0ea2327f into main am: e2860d9db6 am: c012f4ece4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273493

Change-Id: Iaa74e0c7332c9a3e8a5180db3bac0abd7edc4318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-23 21:18:32 +00:00
Spandan Das
e2860d9db6 Merge changes I0edb681b,I0ea2327f into main
* changes:
  Remove internal deapexer module
  Remove deapex support from java_*_import
2024-09-23 20:28:36 +00:00
Spandan Das
52c01a1897 Remove internal deapexer module
The build ations will be created by the top-level apex.

Details
1. In GenerateAndroidBuildActions, do a graph walk to determine if the
   apex has exported deps.
2. If there are exported deps, call the newly introduced `deapex`
   function. This registers the build rules and returns a DeapexerInfo
object. This was previously provided by the internal deapexer
dependency.
3. Update `dexpreoptSystemServerJars and `provideApexExportsInfo` to use
   the DeapexerInfo object from (2).

A lot of unit tests that relied on the legacy mechanism of deapexing
have been updated.

Test: go test ./apex
Test: lunch cf_x86_64_phone-next-userdebug (uses mainline prebuilts)
Test: verified no diff in file_list.txt
Bug: 368337090
Change-Id: I0edb681beccac4d2a9ceb73f9a506c081a8a96e0
2024-09-20 23:47:36 +00:00
Inseob Kim
4dfcda17d4 Merge "Make init_rc property configurable" into main am: b33154033a am: a75c89fb81
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3266331

Change-Id: I137376f29caa4acf60064f99e48ab5d79dc5868f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-20 08:54:18 +00:00
Inseob Kim
b33154033a Merge "Make init_rc property configurable" into main 2024-09-20 08:01:57 +00:00
Treehugger Robot
e1f70a0af2 Merge "Add default_visibility for soong modules" into main am: fc79aabd84 am: 3b36ffb65f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3271955

Change-Id: I3712fefedf8f3114563355261f7f22ef9ce9c374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-19 02:24:55 +00:00
Inseob Kim
713b87da61 Make init_rc property configurable
Bug: 331320802
Test: build
Change-Id: Id9c85f2f80381febf360fe320ee43017ec9948b1
2024-09-19 10:13:21 +09:00
Cole Faust
16d227a725 Add default_visibility for soong modules
So that we don't get surprise usages.

Bug: 348717861
Test: m nothing
Change-Id: I47319a727092c1bd936cca88f5713ee977a48b48
2024-09-18 17:41:30 -07:00
Yu Liu
8b8796fedf Merge "Add a system test to check the mk and ninja files generated by incremental build." into main am: 3249ac6d3f am: 69afa4b020
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3266053

Change-Id: If0131f2a101a77b792209da41627baee32508b74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-18 20:59:04 +00:00
Yu Liu
3249ac6d3f Merge "Add a system test to check the mk and ninja files generated by incremental build." into main 2024-09-18 20:43:01 +00:00
Treehugger Robot
10c4a0aacb Merge "Convert trivial TopDown mutators to BottomUp" into main am: dbb3ef9ac2 am: 6c2a7e139d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3270769

Change-Id: Ic539574951e46a82d3c92d0b6308c2d72bec678c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-18 20:17:14 +00:00
Treehugger Robot
dbb3ef9ac2 Merge "Convert trivial TopDown mutators to BottomUp" into main 2024-09-18 20:05:09 +00:00
Treehugger Robot
71bf541d0c Merge "Enable object-size sanitizer for C++" into main am: 411346c919 am: 64179a0427
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3259736

Change-Id: I03be43517d3bcdd5524ebb16afd1fedaaff0a302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-18 19:58:53 +00:00
Treehugger Robot
411346c919 Merge "Enable object-size sanitizer for C++" into main 2024-09-18 19:44:30 +00:00
Yi Kong
76e99ad68e Enable object-size sanitizer for C++
This was previously disabled due to a bug in libc++'s __tree implementation. That bug has been fixed, so we can now enable this sanitizer.

Change-Id: Ibbdfbe843aa02ef31d2a10b0c6a87500b7f60b42
Test: presubmit
2024-09-18 18:43:26 +00:00
Colin Cross
da279cfba4 Convert trivial TopDown mutators to BottomUp
Many TopDown mutators can be easily converted to BottomUp mutators,
which are easier to handle for incremental and partial analysis.

Bug: 367784740
Test: all soong tests pass
Test: no change to build.ninja
Flag: EXEMPT refactor
Change-Id: I82955e844ed0eb6680854678c0744ac5398eb7ba
2024-09-18 10:14:19 -07:00
Rico Wind
62cb2dd6b7 Merge "Launch flag guarded always on optimized resource shrinking" into main am: 15c5e54de7 am: 2df97e944d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3241280

Change-Id: I820281a8a2b272908cb60aeeae4279faa5688fbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-18 08:27:43 +00:00
Rico Wind
15c5e54de7 Merge "Launch flag guarded always on optimized resource shrinking" into main 2024-09-18 07:31:54 +00:00
Zi Wang
94d0c2a4df Merge "Create a singleton that generates an empty bp file" into main am: 26cd6dd780 am: a844d55c8e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3270758

Change-Id: I0936555b9f1e6c228b30b24164041c3774c8edaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-18 00:43:05 +00:00
Zi Wang
26cd6dd780 Merge "Create a singleton that generates an empty bp file" into main 2024-09-18 00:05:37 +00:00
mrziwang
2aafdc5f9c Create a singleton that generates an empty bp file
This singleton will be used to generate a bp file based on
make-based product config later.

Test: m and CI
Bug: 367418637
Change-Id: I98caea5419f1facd3fa9ca5c6389d16a7aa2ce5d
2024-09-17 14:56:43 -07:00
Treehugger Robot
fb5934f9c1 Merge changes I41978037,I19e8a9e8 into main am: 809aaeb90b am: df86e9ee4f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3266866

Change-Id: I443bda3a9b043bf198ba9121e9916e9715cc6977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 21:17:49 +00:00
Treehugger Robot
809aaeb90b Merge changes I41978037,I19e8a9e8 into main
* changes:
  Properly initialize android_system_image modules
  Add otherModuleProvider to ConfigurableEvaluatorContext
2024-09-17 20:07:08 +00:00
Colin Cross
328a23eb40 Merge "Convert test mutators to TransitionMutators" into main am: e95232426d am: b8cc10da46
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3268014

Change-Id: Ia6b438c761bafc94f28395f6b9df36549b5bc4ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 19:34:28 +00:00
Colin Cross
e95232426d Merge "Convert test mutators to TransitionMutators" into main 2024-09-17 19:05:06 +00:00
Colin Cross
b032510100 Merge "Convert arch and os mutators to TransitionMutators" into main am: 1531a12d2d am: 906856c785
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3262266

Change-Id: I18e45ebdf7d292619664cf91918ae3592a31122a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 18:09:01 +00:00
Colin Cross
1531a12d2d Merge "Convert arch and os mutators to TransitionMutators" into main 2024-09-17 17:06:14 +00:00
Colin Cross
d27205e8da Convert test mutators to TransitionMutators
Convert various mutators in tests to TransitionMutators.

Bug: 319288033
Flag: EXEMPT refactor
Test: all soong tests pass
Change-Id: I1da55889c391582a7c825c118c5988ec27820237
2024-09-16 17:00:39 -07:00
Colin Cross
8bbc3d5a30 Convert arch and os mutators to TransitionMutators
Replace archMutator and osMutator with TransitionMutators.

Bug: 319288033
Flag: EXEMPT refactor
Test: all soong tests pass
Test: no change to out/soong/*.ninja
Change-Id: I92a4d7c895dd79f1dd8064d0ca90e7010b563525
2024-09-16 17:00:39 -07:00
Cole Faust
55b56feb86 Add otherModuleProvider to ConfigurableEvaluatorContext
So that it can make decisisons based on a provider set by the
base config mutator.

Bug: 361816274
Test: m nothing
Change-Id: I19e8a9e800dfabcd05740f9c0ed5db833c5b2377
2024-09-16 15:10:05 -07:00
Treehugger Robot
19256badc5 Merge "Prevent evaluating configurable properties before the defaults mutator" into main am: 0bfceee178 am: 268959a55b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3268013

Change-Id: I2b5ea50925f00594c94aa61c60f92dbccf86e960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-14 00:41:42 +00:00
Cole Faust
d706709bf0 Prevent evaluating configurable properties before the defaults mutator
So that we can change the configuration after the defaults mutator
has run.

Bug: 361816274
Test: Presubmits
Change-Id: I550088b2555d275a86b5dd4d57e85a9ece859233
2024-09-13 13:37:59 -07:00
Rico Wind
a7b38592f8 Launch flag guarded always on optimized resource shrinking
This will use the RELEASE_USE_OPTIMIZED_RESOURCE_SHRINKING_BY_DEFAULT flag - default enabling in trunk staging will be done in a follow up cl

To disable optimized resource shrinking on an app basis one can opt out with
  optimized_shrink_resources: false
bug please file a bug for us to find out why (so that we can remove legacy mode)

Bug: 325905703
Test: Existing
Change-Id: Idb57b8e6bba26f06c044657492ff4ae89ec81254
2024-09-13 09:12:56 +00:00
Dennis Shen
b340dd2140 Treat system_ext as system container am: 01efb83420 am: bf9c8f0613
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3261301

Change-Id: I51244bb6eb12207b122c5c1316347516726d23df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 02:20:12 +00:00
Yu Liu
4faab81e8e Add a system test to check the mk and ninja files generated by incremental build.
Bug: 358428180
Test: Run the test locally.
Change-Id: If1862ee44976216f3c5a5c62d50c6d688d38023b
2024-09-12 23:56:31 +00:00
Dennis Shen
01efb83420 Treat system_ext as system container
Bug: b/365135457
Test: m
Change-Id: Ic8fd60c0e1045f190b6608931ca1d65a784026f0
2024-09-12 23:31:49 +00:00
Treehugger Robot
cf9a26272a Merge "Don't evaluate the enabled property in a defaultable hook" into main am: c379ea0fd4 am: 9e67f9499a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3264841

Change-Id: Ie75437c9cd18539d3a670080f40378e6a4a49d94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 20:42:00 +00:00
Cole Faust
8eeae4bbbe Don't evaluate the enabled property in a defaultable hook
So that we can decide the configuration after defaults are evaluated.
Instead, pass the enabled property on to submodules.

Bug: 361816274
Test: m nothing --no-skip-soong-tests
Change-Id: I853d557ed022f7434287cea0a2a19e684b59e145
2024-09-12 11:51:04 -07:00
Treehugger Robot
a5183bc660 Merge "Introduce a util method PrettyConcat" into main am: 167230037c am: 9919167ca7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3262082

Change-Id: I73cdc02a762801750cd7b9e211e3c85230fe2b1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 17:22:56 +00:00
Treehugger Robot
167230037c Merge "Introduce a util method PrettyConcat" into main 2024-09-12 17:10:11 +00:00
Treehugger Robot
56488f7549 Merge "Wrap blueprint_go_binary and bootstrap_go_package into android.Modules" into main am: 82e99ce373 am: 64c9cd249a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3260639

Change-Id: I5252332b257178592dd7101203368e5a4eacadb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 16:06:37 +00:00
Colin Cross
1496fb1675 Wrap blueprint_go_binary and bootstrap_go_package into android.Modules
Depending on a blueprint_go_binary from a Soong module requires hacks
that allow Soong to support both blueprint.Module and android.Module.
Wrap the blueprint Go module types with ones that implement
android.Module, and delete all the related hacks.

Bug: 319288033
Test: m checkbuild
Flag: EXEMPT refactor
Change-Id: I9b62b450de09bd10288333fbc66aa71c867ae0b3
2024-09-11 21:16:25 -07:00
Treehugger Robot
46b3f7e4ed Merge "Soong system image may update the $PRODUCT_OUT" into main am: 6fab06d56b am: d94bbc9ce2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3261533

Change-Id: I7e010d217d7e9dc28429a813f20bbb59994eefe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 00:44:33 +00:00
Treehugger Robot
6fab06d56b Merge "Soong system image may update the $PRODUCT_OUT" into main 2024-09-12 00:25:21 +00:00
Cole Faust
e1f4b2d1a1 Merge "Add HasMutatorFinished" into main am: 7351875acb am: c8d5bd08b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3263046

Change-Id: Ia713a66b9db87a8d328796a2810d52c50dfcd3c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 00:23:16 +00:00
Jihoon Kang
6e0280d795 Introduce a util method PrettyConcat
The method can be used when printing string list in a well-formated way
in user-facing messages.
This will be used in a follow up change.

Test: m nothing --no-skip-soong-tests
Change-Id: I77e3445a5333f82067dd8f1bb6ad892c69754ece
2024-09-12 00:11:34 +00:00
Cole Faust
7351875acb Merge "Add HasMutatorFinished" into main 2024-09-12 00:02:10 +00:00
Zi Wang
3e6717b1fd Merge "Add framework for using provider on AndroidMKEntries" into main am: 6ad2e30de3 am: e24ae27939
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3250919

Change-Id: Ic221f97b39a20f00b4a678a9f8b7897a3d70798a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 23:46:36 +00:00
Zi Wang
6ad2e30de3 Merge "Add framework for using provider on AndroidMKEntries" into main 2024-09-11 23:02:33 +00:00
Cole Faust
4e2bf9fb2d Add HasMutatorFinished
To enforce that selects are only evaluated after a certain point
in a followup cl.

Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: Ib215fedb904aa2e5f4d65cfd26a23f527eb4983e
2024-09-11 14:48:50 -07:00