Commit Graph

8566 Commits

Author SHA1 Message Date
Yu Liu
de9f7f2f00 Merge "Access output files thru providers in Soong tests." into main am: fed2be9f98
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3233572

Change-Id: If5bbef16025bfe3d95615398ac4afa97604daf29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-21 17:31:58 +00:00
Yu Liu
51c2231eab Access output files thru providers in Soong tests.
The outputFiles field on ModuleBase will be removed next.

Bug: 358425833
Test: CI
Change-Id: I6d665ac13134d9278e5908f64c454366bc6bca5e
2024-08-21 00:03:50 +00:00
Yu Liu
e5b9b5bccc Merge "Remove build target related fields from ModuleBase." into main am: 97bf07a2ef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3233882

Change-Id: I33d14eca24d56f163132500f0557388e5ab457e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 23:27:18 +00:00
Yu Liu
0dea28eafa Merge "Use namespace path instead of id in phonies." into main am: 1c794c66c7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3233249

Change-Id: If463afcb4481c662d61e6f2d8ab153e154b1c875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 22:07:38 +00:00
Yu Liu
ddc2e1ac09 Remove build target related fields from ModuleBase.
Bug: 358425833
Test: CI
Change-Id: I2af6d0d2fd3be70594860a0e6d86179d5850eb07
2024-08-20 21:31:22 +00:00
Yu Liu
460c0fa8b4 Use namespace path instead of id in phonies.
Otherwise the phones' names depend on the sorting order of all the
namespaces, which add unnecessary dependencies.

Bug: 358425833
Test: CI
Change-Id: Ic88a329ff320e508ece8e3b20c7497a28a619276
2024-08-20 19:34:49 +00:00
Yu Liu
b5ae3f66a2 Merge "Add phonies as provider instead of updaing a global map." into main am: ee5b92fd6c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3229623

Change-Id: I3a075db80ad7c45067b080a2df8c50fc56b40b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 16:02:36 +00:00
Yu Liu
ee5b92fd6c Merge "Add phonies as provider instead of updaing a global map." into main 2024-08-20 15:56:33 +00:00
Cole Faust
83fcbf8350 Merge "Add $(build_number_file) support to genrules" into main am: cda9ce15ff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3225783

Change-Id: I3e1a5224278a962a9eb6b9fb7f186e63d9d4f668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 05:05:33 +00:00
Cole Faust
cda9ce15ff Merge "Add $(build_number_file) support to genrules" into main 2024-08-20 04:57:41 +00:00
Treehugger Robot
7af3d43dfb Merge "apex: apex_available with prefix" into main am: d4daa43150
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3223005

Change-Id: I080db49d61b8cc66a2ba2c71ae4be0eebb856f5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 02:51:20 +00:00
Treehugger Robot
d4daa43150 Merge "apex: apex_available with prefix" into main 2024-08-20 02:45:22 +00:00
Jooyung Han
9a419e28f5 apex: apex_available with prefix
We now support prefix form (com.foo.*) in apex_available list.

Bug: 360265761
Test: m --no-skip-soong-tests
Change-Id: I50ab884651dd6321950cfd4563b59ef3ed0f07fd
2024-08-20 10:50:04 +09:00
Cole Faust
78f3c3a3ad Add $(build_number_file) support to genrules
Genrules that set uses_order_only_build_number_file: true will now
have the ability to reference a $(build_number_file) label that
will point to the build number file. It will also caused the build
number file to be added as an order-only dependency, which will make
it show up in the genrule sandbox.

This is needed for converting make code that references the build
number to soong, and for sandboxing the remaining unsandboxed genrules
that reference the build number.

Bug: 341873065
Test: m nothing --no-skip-soong-tests
Change-Id: I9092cbb0eb39c5449a79f0ee40a4202262cef206
2024-08-19 16:06:34 -07:00
Cole Faust
ba4d002aaf Merge "Make the WholeStatic/Static/Shared libs properties configurable" into main am: 5b1a39a92a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3229386

Change-Id: Ifc8f019a075c397e513fa702e5302613fa2687d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-19 22:51:15 +00:00
Cole Faust
5b1a39a92a Merge "Make the WholeStatic/Static/Shared libs properties configurable" into main 2024-08-19 22:48:16 +00:00
Yu Liu
54513622f7 Add phonies as provider instead of updaing a global map.
Bug: 358425833
Test: Manually compare the generated mk and ninja files.
Change-Id: Ie74b620fc680ca2fc0d7836e88361ab3bdb87c49
2024-08-19 21:45:07 +00:00
Cole Faust
f0006e7137 Make the WholeStatic/Static/Shared libs properties configurable
So that you can use selects with them.

Bug: 342006386
Bug: 358377461
Test: m nothing --no-skip-soong-tests
Change-Id: I5a8350f670d51b7da411ad5c3cdbf5f2d6cdd63b
2024-08-19 14:39:19 -07:00
Ronald Braunstein
5d10410133 Merge "Search for default_team in Android.bp when other .bp files are included." into main am: ea66cdd278
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3221923

Change-Id: I3b16fd0920c99a2fc7833aacd19341a288579a4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-19 20:13:51 +00:00
Ronald Braunstein
ea66cdd278 Merge "Search for default_team in Android.bp when other .bp files are included." into main 2024-08-19 19:54:10 +00:00
Colin Cross
a362352f2a Merge "Add test for interactions between product variables and arch variant properties" into main am: 67478b347e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3221984

Change-Id: I98e61c07bc0eebb264085af55cdf2d294c9d1be2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-19 16:36:11 +00:00
Colin Cross
67478b347e Merge "Add test for interactions between product variables and arch variant properties" into main 2024-08-19 16:19:34 +00:00
Treehugger Robot
903a500065 Merge changes Ia0e1b307,I63c7c33e into main am: a5289ac9ef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216639

Change-Id: I5de31ae329756b4fd028e58e1bf9299eb3ad8347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-17 04:43:09 +00:00
Treehugger Robot
a5289ac9ef Merge changes Ia0e1b307,I63c7c33e into main
* changes:
  Define unstable container
  Define additional exception functions for container enforcement
2024-08-17 04:07:00 +00:00
Jihoon Kang
0f3b1a7288 Define unstable container
Unstable container marks modules that are static reverse dependencies of
"framework-minus-apex". These modules contain unstable implementation
details of the platform, and should not be accessed by the CTS tests.

Test: m nothing
Bug: 338660802
Change-Id: Ia0e1b3070f0f7b2c1b9c27306323e2428d9722ca
2024-08-16 22:57:57 +00:00
Jihoon Kang
224ea08ee6 Define additional exception functions for container enforcement
These exception functions allow restriction to be loosened for some
inter-container dependencies.

Note that these functions are still no-op. Restriction enforcement will
be done in the child change.

Test: m nothing
Bug: 338660802
Change-Id: I63c7c33e33f271d4c2a84cc6070eb4896e030ab4
2024-08-16 22:57:39 +00:00
Treehugger Robot
48f28c9232 Merge "Clean up: remove com.android.gki.*" into main am: 75b14ee1a6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3223004

Change-Id: Ia630547bc9458b60ec31c7cc50a3cba762f11334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-16 22:31:19 +00:00
Yu Liu
a5c0d1f355 Merge "Remove more internal fields from ModuleBase." into main am: fb995a1e3c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3221927

Change-Id: Icafa7150b5320cbff6dffaef15453a078f39c9a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-16 22:27:52 +00:00
Treehugger Robot
75b14ee1a6 Merge "Clean up: remove com.android.gki.*" into main 2024-08-16 22:22:19 +00:00
Yu Liu
fb995a1e3c Merge "Remove more internal fields from ModuleBase." into main 2024-08-16 22:14:01 +00:00
Colin Cross
7da471f3ab Add test for interactions between product variables and arch variant properties
Add a test that verifies that arch variant product variable
properties are correctly squashed into the top level properties.

Bug: 322089980
Flag: EXEMPT test only
Test: TestProductVariablesArch
Change-Id: I62e9b4166761ce6ac0269e2fafc26d603e6b169e
2024-08-16 09:21:18 -07:00
Jooyung Han
40b7917fd0 Clean up: remove com.android.gki.*
It's abandoned.

Bug: n/a
Test: m nothing --no-skip-soong-tests
Change-Id: I220bea87329ee532d494cc4eaa4c6a8c1b0bff07
2024-08-16 16:02:42 +09:00
Kiyoung Kim
a1d5004a0f Merge "Introduce vintf_fragment module type" into main am: dd00f2de3c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3213372

Change-Id: Ib6315fa25700f5424791813317b640406ce96b6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-16 00:39:54 +00:00
Kiyoung Kim
dd00f2de3c Merge "Introduce vintf_fragment module type" into main 2024-08-16 00:26:16 +00:00
Yu Liu
d46e5ae670 Remove more internal fields from ModuleBase.
Bug: 358425833
Test: Manual compare the generated ninja and mk files and CI.
Change-Id: I4edd0dc646ac035594f47cd9044cc4eb5f710e64
2024-08-16 00:20:27 +00:00
Ronald Braunstein
4a2f368b46 Search for default_team in Android.bp when other .bp files are included.
Test: m all_teams && gqui from  "flatten(out/soong/ownership/all_teams.pb, teams)" proto build/soong/android/team_proto/team.proto:AllTeams 'select teams.path, count(*) where teams.trendy_team_id == "4768044190400512" and teams.path like "%libcore%"  group by teams.path '

  Now we get the libcore entries for JavaLibrary.bp and NativeCode.bp as
  well.  Before we didn't
        ...
	| external/icu/android_icu4j/libcore_bridge/src/native/Android.bp |        1 |
	| libcore/Android.bp                                              |        3 |
	| libcore/Extras.bp                                               |        1 |
	| libcore/JavaLibrary.bp                                          |       82 |
	| libcore/NativeCode.bp                                           |       10 |
	| libcore/benchmarks/Android.bp                                   |        3 |
	...

Note: blueprint does not let include a file from a subdirectory.

Bug: b/355270459
Change-Id: I19b22e341276c724786ea96e237733eac4f19dbf
2024-08-15 15:07:01 -07:00
William McVicker
9fd0ad4ca9 Merge "Fix build_prop module to use partition() instead of PartitionTag()" into main am: d0ea3f6a84
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216965

Change-Id: I88f558e782dc02a58b32ce6ac42c7e300a601010
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-15 21:15:19 +00:00
William McVicker
d0ea3f6a84 Merge "Fix build_prop module to use partition() instead of PartitionTag()" into main 2024-08-15 20:58:46 +00:00
Cole Faust
cf2d680a05 Merge "Check that the DeapexerInfo was actually set" into main am: 47a91c9f4f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216739

Change-Id: I9d23271205f555da55c0f4a2022927f6eaf88fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-15 18:18:36 +00:00
Cole Faust
47a91c9f4f Merge "Check that the DeapexerInfo was actually set" into main 2024-08-15 18:00:22 +00:00
Yu Liu
df8125ba55 Merge "Remove installFiles from ModuleBase." into main am: e89b6dd497
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3214788

Change-Id: I194534a60f18f2a2c0d8f2eac65cc400e50d927a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-15 17:45:56 +00:00
Yu Liu
e89b6dd497 Merge "Remove installFiles from ModuleBase." into main 2024-08-15 17:23:59 +00:00
Treehugger Robot
135b15001c Merge "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for soong" into main am: 4483c0e7c0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3195824

Change-Id: I64fe62dab270f41bd24f38dd36460b9b381e9448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-15 09:35:44 +00:00
Treehugger Robot
4483c0e7c0 Merge "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for soong" into main 2024-08-15 09:07:38 +00:00
Yi-Yo Chiang
3ffc37ce20 Fix build_prop module to use partition() instead of PartitionTag()
PartitionTag() returns the partition the module is installed in.
We don't want this because a system_ext_specific module could be
installed in the system partition if system_ext partition doesn't
exist.
Instead we want system_ext specific modules to always refer to
SystemExtPropFiles().

Bug: 359624775
Bug: 322090587
Test: build aosp_arm64 and verify system/system_ext/etc/build.prop
Change-Id: Ie67ec9c5e5a07e781515e0aafb42122f72447cf3
2024-08-15 07:52:02 +00:00
Cole Faust
c0ca5056ab Check that the DeapexerInfo was actually set
Otherwise we could return empty DeapexerInfos. We're not running into
any problems due to this at the moment, it's just something I noticed.

Bug: None
Test: m nothing --no-skip-soong-tests
Change-Id: I903d86740a9f22574a5f6bf2effa912bd8237ab6
2024-08-14 17:51:03 -07:00
Yu Liu
ddc2833b7f Remove installFiles from ModuleBase.
This is to limit the direct accesses to the internal fields of a
module in order to better support incremental caching. To access
the install files data from singleton context or other modules'
context use providers thru the provided wrapper; to access it
from the same module inside GenerateBuildActions use ctx which is
short-lived only inside this method.

Bug: 358425833
Test: CI
Change-Id: I337b07a2ef95fb2a898ac2f9277160a3f76a603c
2024-08-14 22:56:30 +00:00
Kiyoung Kim
faf6af31cd Introduce vintf_fragment module type
Introduce a new vintf_fragment module type which handles vintf_fragment
files within Soong. This will help process to move vintf_fragment
handling logic from KATI to Soong. This change also introduces
vintf_fragment_modules property to mark dependency with vintf_fragment
modules.

Bug: 322089980
Test: m nothing --no-skip-soong-tests passed
Change-Id: I49607f42aeee3ded0ba7b078b903dc35f5d61637
2024-08-14 10:34:41 +09:00
Yu Liu
2db4f06825 Merge "Skip writing ninja file for module with a cache hit during incremental build." into main am: 8bf4079e5f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3199910

Change-Id: I9499830d7a05690bcb4f3be40cf5261bca1541a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-13 17:34:46 +00:00
Yu Liu
8bf4079e5f Merge "Skip writing ninja file for module with a cache hit during incremental build." into main 2024-08-13 17:00:55 +00:00