StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,828 Commits 1 Branch 0 Tags
d7f76df39bc49b4cccdee0af169b4242e793e65a
Commit Graph

8750 Commits

Author SHA1 Message Date
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
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
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
Cole Faust
a2847f62d2 Rename ConfigAndErrorContext to ConfigurableEvaluatorContext am: e8a8783154 am: 7e167d1516 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3263043

Change-Id: I1846d97a9d93b5c80c0f14e9f6f081e358457162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 20:42:25 +00:00
Cole Faust
e8a8783154 Rename ConfigAndErrorContext to ConfigurableEvaluatorContext 
I'm going to be adding some methods to this interface, give it
a name based on how it's going to be used, not based on what methods
it contains.

Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: I9bba04ba756c4dbe00625e2d04af81e78a11cae9
 2024-09-11 11:35:46 -07:00
mrziwang
1842097928 Add framework for using provider on AndroidMKEntries 
In the context of incremental soong, the inter-module communication
through AndroidMkEntries and AndroidMkData should be changed to
through the real provider.

This change adds the framework for the provider(AndroidMkInfoProvider).
A module will set its AndroidMkInfoProvider, which includes what's
in its AndroidMkEntries method, to be used in translateAndroidMkModule.

This change also changes module type vbmeta to use
AndroidMKInfoProvider.

The next step is to replace the AndroidMkEntries methods of all the
other module types to set the AndroidMkInfoProvider.

Test: m with tests and CI
Bug: 357907638
Change-Id: Icfd1363f97d31548bb78c6615e0f7076b22dcbe4
 2024-09-11 10:38:41 -07:00
Krzysztof Kosiński
372247c264 Merge "Add missing pieces of ARMv9.2-A support." into main am: 28b806c9eb am: cab8f1278f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3258911

Change-Id: Ida4d3c5c30928ab198f40766789890c3c5c97eb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 16:26:18 +00:00
Krzysztof Kosiński
28b806c9eb Merge "Add missing pieces of ARMv9.2-A support." into main 2024-09-11 16:04:44 +00:00
Neill Kapron
82791152bd Merge "SOONG: BPF: add libbpf_prog soong module" into main am: f1d63b8b6d am: 2b4699841d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3202693

Change-Id: I581050f515256b634e94d75a65b7489545ccf0ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 15:53:47 +00:00
Neill Kapron
f1d63b8b6d Merge "SOONG: BPF: add libbpf_prog soong module" into main 2024-09-11 15:41:14 +00:00
Justin Yun
2cc42505d9 Soong system image may update the $PRODUCT_OUT 
A target must define "USE_SOONG_DEFINED_SYSTEM_IMAGE := true" and
"PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE := <name of soong system image>"
to use the soong defined system image.
The system image must install the files to $PRODUCT_OUT for adb sync
and build verification. Instead of using 'update_product_out'
property in Android.bp, copy the files only if the name of the image
matches with PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE.

Bug: 350599535
Bug: 365700376
Test: lunch aosp_x86_64-trunk_staging-userdebug && m &&
      m aosp_cf_system_x86_64
Test: lunch aosp_cf_x86_64_phone_soong_system-trunk_staging-userdebug
      && m
      and adb sync on the cf device
Change-Id: If8673ba2855a753a5559a588bd83068d950fd7e4
 2024-09-11 14:34:44 +09:00
Jim Tang
1c0a7e9ef7 Merge "Support apk for product_variables.debuggable" into main am: 01c3234190 am: d39ad81a6b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3261653

Change-Id: I1986f86101caa4d502895eb1f31d295416b2b954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 03:09:02 +00:00
Jim Tang
01c3234190 Merge "Support apk for product_variables.debuggable" into main 2024-09-11 02:56:11 +00:00
Cole Faust
3ec447b668 Merge "Remove BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" into main am: dd46300414 am: 0776ae425d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3261492

Change-Id: I2045d6f00a14f2d04cd8628ef11a105fc41cef40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-10 19:42:33 +00:00
Cole Faust
dd46300414 Merge "Remove BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" into main 2024-09-10 19:33:04 +00:00
Jim Tang
914832444e Support apk for product_variables.debuggable 
Bug: 365707065
Test: m FactoryOtaPrebuilt
Change-Id: I880b9d48b52d49cbf8c1eca6a67d3ffadc8ea0fc
 2024-09-10 18:06:22 +08:00
Cole Faust
4ce4f8893e Remove BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES 
It's been available for over a year, lets progress the python3 migration
by removing it.

Bug: 203436762
Test: Presubmits
Change-Id: I46a6477ec65e98b7e6df5cc1359f676dcbd0f08e
 2024-09-09 18:08:49 -07:00
Spandan Das
cea4f96853 Remove extra space in error message am: ca9ccec822 am: b6d261875b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3261293

Change-Id: Iaebeb88ccb692696bcb9cf2c4c25eba0afcb4fce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-10 00:23:09 +00:00
Spandan Das
ca9ccec822 Remove extra space in error message 
Change-Id: I45420afc37736ec8fecd0c489c35c14b377a71a5
Test: N/A
 2024-09-09 22:58:11 +00:00
Krzysztof Kosiński
b8c5e95e26 Add missing pieces of ARMv9.2-A support. 
aosp/3255916 didn't add all of the required infrastructure.
Refactor it to be more like x86_64 so it requires less
boilerplate code.

Bug: 364383722
Test: presubmit
Change-Id: Idc5279ffc5fe964bea9f98873c01468944d90091
 2024-09-07 03:11:25 +00:00
Xin Li
aa8ceca851 Merge "Merge 24Q3 to AOSP main" into main 2024-09-07 01:12:30 +00:00
Treehugger Robot
63abf09fd9 Merge "Remove asset dir glob files" into main am: f2c204c655 am: 9d269b6956 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3257951

Change-Id: I14d1f997a18e08b46333c5bcf376b5841d34e8b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-06 16:42:36 +00:00
Colin Cross
ab8082c117 Merge "Use transitive header jars in classpaths" into main am: 399ff4019d am: f6c08dba54 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3214782

Change-Id: Ia95c786776fdfba7b1e0144febce6f0ecd5984dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-06 16:42:19 +00:00
Treehugger Robot
9d269b6956 Merge "Remove asset dir glob files" into main am: f2c204c655 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3257951

Change-Id: I49203ac5f042cad529c4f5f56186f4385a5126b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-06 16:31:20 +00:00
Colin Cross
f6c08dba54 Merge "Use transitive header jars in classpaths" into main am: 399ff4019d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3214782

Change-Id: I034fe6ddbd7bcafb40807cd00973d7f0f36e6339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-06 16:30:58 +00:00
Treehugger Robot
f2c204c655 Merge "Remove asset dir glob files" into main 2024-09-06 16:22:06 +00:00