Commit Graph

8542 Commits

Author SHA1 Message Date
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
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
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
Yu Liu
73282e8129 Merge "Merge SingletonProviderContext with OtherModuleProviderContext" into main am: 246b43049c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216676

Change-Id: Ib0d8eb66616fa4775e3827b4956ad19034bf1cc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-13 16:15:51 +00:00
Yu Liu
246b43049c Merge "Merge SingletonProviderContext with OtherModuleProviderContext" into main 2024-08-13 15:56:16 +00:00
Treehugger Robot
4081f58abb Merge "Refactor containers" into main am: f20696e112
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216637

Change-Id: I87fbd3fe98e84488350fd70f9c7d3f322358dcfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-13 05:15:46 +00:00
Treehugger Robot
f20696e112 Merge "Refactor containers" into main 2024-08-13 04:47:43 +00:00
Treehugger Robot
9d699ca096 Merge "Make the srcs and exclude_srcs properties configurable" into main am: aa65374cc1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3217278

Change-Id: Idb36b4a5436e7c40edb51cf311d070f3ef3872d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-13 01:44:05 +00:00
Yu Liu
663e4508dc Merge SingletonProviderContext with OtherModuleProviderContext
Bug: 358425833
Test: CI
Change-Id: I8e3f40dc3cfc5337008b419801f8e6bf2d48e8b2
2024-08-12 22:50:19 +00:00
Cole Faust
96a692bfa9 Make the srcs and exclude_srcs properties configurable
Bug: 358377461
Bug: 342006386
Test: Presubmits
Change-Id: I21c20254a3ad3e75dd401ab807eb57ddbbeac047
2024-08-12 15:27:02 -07:00
Jihoon Kang
17a61d7609 Refactor containers
Implementation details:
- Add documentations
- Convert container determiniation logic to function pointers, in order
  to make addition/deletion of containers more scalable

Test: m nothing
Bug: 338660802
Change-Id: I4f7a9a027e00584bb895ce8559f621bae1e985f6
2024-08-12 22:26:52 +00:00
Colin Cross
6bdec0cbe6 Merge changes If313580b,I68d50d68 into main am: 08b6061539
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3214342

Change-Id: I301643cc587ff80e243115b8f729eba4e0cd3e02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-12 17:37:42 +00:00
Colin Cross
08b6061539 Merge changes If313580b,I68d50d68 into main
* changes:
  Use a provider for systems modules
  Add PrepareForTestWithBuildFlag
2024-08-12 16:53:42 +00:00
Treehugger Robot
5c9c275d6e Merge "Build product/odm build.prop with Soong" into main am: 6f4d57a790
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3213179

Change-Id: I4f480134015a513ea5378a8a5bf92e440d33f41c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-12 00:36:42 +00:00
Colin Cross
a66b4630f6 Add PrepareForTestWithBuildFlag
Add a helper function that creates a test fixture preparer that
sets a build flag, and use it everywhere that was setting build flags
manually.

Test: all soong tests
Flag: EXEMPT refactor
Change-Id: I68d50d68787a30d091f0827e8caa51f5c5a762ef
2024-08-09 16:47:45 -07:00
Inseob Kim
01d4f8b823 Build product/odm build.prop with Soong
Bug: 322090587
Test: compare build.prop before and after, boot
Change-Id: I7a7dc785030a0c17e5c09b7f65c978fe9bbcb7a7
2024-08-08 18:13:08 +09:00
Treehugger Robot
3f0b5f6f12 Merge "Don't hold on to WritablePath" into main am: d40aac1340
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3198492

Change-Id: I4fdf37dbd48d995efc26f6784e61f5af57538f11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-07 21:09:40 +00:00
Treehugger Robot
d40aac1340 Merge "Don't hold on to WritablePath" into main 2024-08-07 20:48:50 +00:00
Treehugger Robot
d658fea164 Merge "Remove the hardcoded list of api libraries" into main am: d6358b6a9b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3208811

Change-Id: If6b4054ae155e67d66b2ff7fd71b6b364961e750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-07 00:00:03 +00:00
Jihoon Kang
463893917c Remove the hardcoded list of api libraries
The list no longer need to be maintained given that `java_sdk_library` modules generate from-text stubs by default.

Change-Id: I18c94731d0a337c8815fd589868377fc8933437c
Test: m nothing
Bug: 276958307
2024-08-06 22:39:16 +00:00
Treehugger Robot
5d2439b3b1 Merge "Revert "Revert "Enable from-text stub generation in non-sdk java..."" into main am: 4f18cfdd7d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3205865

Change-Id: I7815c3207e9d41df6e581be31ce3ec1948f7cdba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 19:06:28 +00:00
Treehugger Robot
4f18cfdd7d Merge "Revert "Revert "Enable from-text stub generation in non-sdk java..."" into main 2024-08-06 18:50:04 +00:00
Wei Li
4ba43fdf89 Merge "Switch SBOM generation of products to Soong." into main am: b320ab283c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3205082

Change-Id: I2eee1c23b24b66c9c29785011f3206cd37747f7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 18:21:23 +00:00
Wei Li
b320ab283c Merge "Switch SBOM generation of products to Soong." into main 2024-08-06 18:17:36 +00:00
Treehugger Robot
59f0d23ff6 Merge "Add system_ext support to build_prop module" into main am: 32b8daff1d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3204632

Change-Id: I1f401c480670cd8ddacd351fc5ea5fb8f01fc6a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 10:15:58 +00:00
Treehugger Robot
fc413ce622 Merge "Hide unflagged mainline prebuilts with missing source." into main am: 9b10ca4711
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3203370

Change-Id: Idbd05e89c743e0b669092a0f77a1d70ebdfb350e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 10:15:41 +00:00
Jihoon Kang
ad5e953a7d Merge "Revert "Enable from-text stub generation in non-sdk java_sdk_library"" into main am: f6d9965cc5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3207397

Change-Id: I46b1257ff9b15143ebed6c3a3e36db5d2617acf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 10:14:59 +00:00