Commit Graph

8595 Commits

Author SHA1 Message Date
Pindar Yang
33d6f763e2 Merge "Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for soong"" into main am: 1282d27291
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3235655

Change-Id: Idac5d2bbdecd6af39d5983b91bd60a7134e81c9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 03:33:33 +00:00
Pindar Yang
1282d27291 Merge "Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for soong"" into main 2024-08-27 03:25:23 +00:00
Pindar Yang
1558cc68ec Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for soong"
Revert submission 3195743-compatibility_matrix

Reason for revert: Build Break, Bug: 361227456

Reverted changes: /q/submissionid:3195743-compatibility_matrix

Change-Id: Ib89cdc64eb816ca0df872473b1e9a9dfdb08ceee
2024-08-27 03:22:41 +00:00
Jihoon Kang
3b7db8f619 Add the list of currently existing violations am: 17a362a506
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3166179

Change-Id: I5656ecab3496a462df5f0ee204e4f7d969cd854e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 01:04:23 +00:00
Jihoon Kang
17a362a506 Add the list of currently existing violations
This change adds the list of currently existing inter-container
dependency violations. The list is extracted from the container
enforcement mutator, which is implemented in the child change
https://r.android.com/3155659, but is splitted into a separate change
for the ease in review and resolving merge conflicts.

Test: m nothing
Bug: 338660802
Change-Id: If0e352092dcd4573daa9a5675f679c38bede18f8
2024-08-26 23:22:01 +00:00
Treehugger Robot
3c6d535b61 Merge "Sandbox the OUT_DIR environment variable" into main am: 803ca1cf0d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3238458

Change-Id: Ib28f617a8623d755df86fe5012843af84990deef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-26 20:56:47 +00:00
Treehugger Robot
803ca1cf0d Merge "Sandbox the OUT_DIR environment variable" into main 2024-08-26 20:49:59 +00:00
Yu Liu
afb4e9440d Merge "Remove installFilesDepSet, packagingSpecsDepSet and licenseInstallMap from ModuleBase." into main am: ad64c5f370
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3236345

Change-Id: I97f2c8d3cbf19c67896fd34ad28ba82276ec1989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-26 19:03:28 +00:00
Yu Liu
ad64c5f370 Merge "Remove installFilesDepSet, packagingSpecsDepSet and licenseInstallMap from ModuleBase." into main 2024-08-26 19:00:12 +00:00
Cole Faust
1ead86c1a5 Sandbox the OUT_DIR environment variable
Currently, OUT_DIR is inherited from the parent process, leading to
scripts being able to find the output directory when the enviornment
variable is set to an absolute path. When sandboxing a command,
also rewrite the OUT_DIR environment variable to the sandboxed one,
so that scripts can't find the real out dir.

Bug: 307824623
Test: Presubmits
Change-Id: I325071121a60bddc4105df680fbdfe3d11dc94e2
2024-08-26 11:12:10 -07:00
Yu Liu
bad1eef6d8 Remove installFilesDepSet, packagingSpecsDepSet and licenseInstallMap
from ModuleBase.

The old packagingSpecsDepSet field is kept temporarily to bypass an
auto-merge issue, and will be removed in next change.

Bug: 358425833
Test: CI
Change-Id: I28b4933459c33224f756cc306cabc8088f9be862
2024-08-26 17:45:38 +00:00
Treehugger Robot
e56547c667 Merge "Make the defaults property non-configurable" into main am: bc75594499
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3238421

Change-Id: I23918fdd5bd6a3a711de84fd71f4a4636e864120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-26 00:11:12 +00:00
Treehugger Robot
bc75594499 Merge "Make the defaults property non-configurable" into main 2024-08-26 00:03:30 +00:00
Qing Shen
3c5afb956e Merge "Revert "Revert "Add a coverage suffix to avoid Ninja file regene..."" into main am: ffb985e9bd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3238687

Change-Id: I49fbf7ac4214e4f811aad2510f3a57328d8c6c17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-23 23:25:13 +00:00
Cole Faust
52d37c3249 Make the defaults property non-configurable
In order to support changing the global configuration per-module,
we can't make decisions on configuration until the configuration is
decided. The defaults mutator is one of the earliest mutators, and
it would be helpful to run it before deciding the configuration.

Bug: 361816274
Test: Presubmits
Change-Id: Iee9c603d7e2601919d636345dfdedae47448db38
2024-08-23 16:20:58 -07:00
Qing Shen
713c54289c Revert "Revert "Add a coverage suffix to avoid Ninja file regene..."
Revert submission 3235973-revert-3207217-emma-flip-time-saver-BYWASVIMTD

Reason for revert: Rolling forward with a fix

Adding a coverage suffix for product_config.go too:

FAILED: ninja: 'out/soong/soong.sdv_core_cf.extra.variables', needed by 'out/soong/.intermediates/build/soong/product_config/product_config.json', missing and no known rule to make it
03:42:23 ninja failed with: exit status 1

Reverted changes: /q/submissionid:3235973-revert-3207217-emma-flip-time-saver-BYWASVIMTD

Change-Id: I74d0e3fda09b1367f3dbb939d4f47c4d09b3d51f
2024-08-23 21:41:52 +00:00
Treehugger Robot
85beba636a Merge "Remove suffix based stub matching logic" into main am: 65c530c17e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3235808

Change-Id: Iad8c5a6fc68dc6e8cc2770a4f3f57a9fac18d3be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-23 03:52:13 +00:00
Treehugger Robot
65c530c17e Merge "Remove suffix based stub matching logic" into main 2024-08-23 03:42:12 +00:00
Jihoon Kang
fa3f0782f7 Remove suffix based stub matching logic
This change prevents non-stub modules with stub suffix from being
determined as the stub module, and instead makes the check more robust
by determining the condition based on the user-hidden
`Stub_contributing_api` property, which is only set for the stub
submodules generated by `java_sdk_library`.

Test: m nothing --no-skip-soong-tests
Bug: 361179822
Change-Id: I28a599c5b4fe1e8460e60580c0535aaf19e39ba3
2024-08-22 22:05:03 +00:00
Yu Liu
57d5cdf50a Merge "Remove outputFiles from ModuleBase." into main am: 75c242497f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3236494

Change-Id: Ibc42cfb9d62072f01fcd5ccc3e0a25166745fcd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 06:53:47 +00:00
Yu Liu
75c242497f Merge "Remove outputFiles from ModuleBase." into main 2024-08-22 06:48:09 +00:00
Treehugger Robot
88ec7ecac6 Merge "Add "TARGET_BOARD_PLATFORM" into ProductVariables" into main am: e0e4a24dcc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3228425

Change-Id: I758c94b9b3ab1f30081cb113a3b160109e573b5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 05:48:55 +00:00
Treehugger Robot
e0e4a24dcc Merge "Add "TARGET_BOARD_PLATFORM" into ProductVariables" into main 2024-08-22 05:43:38 +00:00
Herbert Xue
0fc8abe740 Add "TARGET_BOARD_PLATFORM" into ProductVariables
Bug: 360872208
Bug: 348120216
Test: aosp_cf_x86_64_phone-trunk_staging-eng && m hosttar
Change-Id: I79917b10245b982c466afde0570d9da0395232b3
2024-08-22 00:54:10 +00:00
Kiyoung Kim
3c3e6d489a Merge changes from topic "product_variable_vintf_fragments" into main am: 17b4117cb8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3226763

Change-Id: Ibef6755d6d6a18a9f223b33b1121a32aa45fcc5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:48:18 +00:00
Kiyoung Kim
17b4117cb8 Merge changes from topic "product_variable_vintf_fragments" into main
* changes:
  Variables uses vintf_fragment_modules
  Append vintf_fragment_modules as required for AndroidMk
2024-08-22 00:41:29 +00:00
Yu Liu
876b7ce263 Remove outputFiles from ModuleBase.
Bug: 358425833
Test: CI
Change-Id: I6c398fbdbc38b99fa62f8670baa44ffd51b5e6d3
2024-08-21 19:11:43 +00:00
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
Kiyoung Kim
a0523daaaa Variables uses vintf_fragment_modules
Product variable cannot be resolved when vintf_fragments are translated
into vintf_fragment modules, because product variables are being handled
after the translation phase. This change updates variables to use
vintf_fragment_modules instead of vintf_fragments so it can be handled
without resolving depenency between two mutators.

Bug: 322089980
Test: aosp cf build succeeded
Change-Id: I224ddb05bd86e24ae220af616b5a89accd043dd2
2024-08-19 11:28:14 +09:00