StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,963 Commits 1 Branch 0 Tags
e1028aa539c6b22268c281b75db721e8383c9bfc
Commit Graph

8613 Commits

Author SHA1 Message Date
Treehugger Robot
e1028aa539 Merge changes from topic "ctx_in_ideinfo" into main am: 9cbbafe300 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3246818

Change-Id: Ia2b721e9967c0772acd7dd261ec18315f6c26b5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-28 00:53:10 +00:00
Treehugger Robot
9cbbafe300 Merge changes from topic "ctx_in_ideinfo" into main 
* changes:
  Add ctx argument to IDEInfo()
  Add configurable property support to neverallow
 2024-08-28 00:49:13 +00:00
Yu Liu
4e5460e156 Merge "Remove moduleInfoJSON from ModuleBase." into main am: 713f415cde 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3243313

Change-Id: I8f89d3e41948e4b26b098c9fdb9523c5f214eb3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-28 00:37:24 +00:00
Yu Liu
713f415cde Merge "Remove moduleInfoJSON from ModuleBase." into main 2024-08-28 00:32:50 +00:00
Inseob Kim
bb6ebb056b Merge "Include TARGET_ODM_PROP to odm/etc/build.prop" into main am: 09557a0aa3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3237749

Change-Id: Ic2eb7fac04e50bb4dfd98cd2757e3d15a5e83090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-28 00:20:56 +00:00
Inseob Kim
09557a0aa3 Merge "Include TARGET_ODM_PROP to odm/etc/build.prop" into main 2024-08-28 00:15:14 +00:00
Treehugger Robot
cc02a664cf Merge "Make IdeInfo into a provider" into main am: 78a3761bde 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3245754

Change-Id: If90b650d7e0832de74a858c541277f9658f477c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-27 23:55:40 +00:00
Treehugger Robot
78a3761bde Merge "Make IdeInfo into a provider" into main 2024-08-27 23:49:10 +00:00
Yu Liu
4297ad9046 Remove moduleInfoJSON from ModuleBase. 
Bug: 358425833
Test: Manually verified all the generated ninja and mk files and CI.
Change-Id: I145272636b87b20e49c05e847336737cccc20f79
 2024-08-27 23:23:26 +00:00
Yu Liu
457cf82ecc Merge "Remove 6 install related fields from ModuleBase." into main am: 3e4458bf52 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3245217

Change-Id: Iad60c890b14ced77921ca70b42fb71a102a70389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-27 23:21:34 +00:00
Cole Faust
b36d31d870 Add ctx argument to IDEInfo() 
The IDEInfo() methods read properties. To make those properties
configurable, we need a context to evaluate them with.

Bug: 362579941
Test: m nothing --no-skip-soong-tests
Change-Id: I26d4b7084439b3006e50b02277298f74a929e1aa
 2024-08-27 16:04:28 -07:00
Cole Faust
5b35cb9aef Add configurable property support to neverallow 
Bug: 362579941
Test: m nothing --no-skip-soong-tests
Change-Id: I50b8bf3cc2e3520a12932b0a0e1041e079379590
 2024-08-27 15:51:19 -07:00
Cole Faust
08c7f86575 Make IdeInfo into a provider 
In order to keep the changes minimal, call the old IdeInfo method right
after GenerateAndroidBuildActions and then set the result of that
into a provider.

Test: Diff'd ninja files and saw no difference.
Change-Id: Ic706e7dbcb7c6e3d2a381ddae383eb87e105f385
 2024-08-27 15:50:35 -07:00
Yu Liu
82a6d1464d Remove 6 install related fields from ModuleBase. 
Bug: 358425833
Test: Manually verified all the generated ninja and mk files and CI.
Change-Id: If2c3417781953a1eef2b07a241424157fd73abff
 2024-08-27 19:03:35 +00:00
Yu Liu
f8b8dcfbea Merge "Remove licenseMetadataFile and installFiles from ModuleBase." into main am: 4b98396c64 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3242292

Change-Id: I1b4551603b70e2faad9dd886b638cc6eb775f03b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-27 15:57:40 +00:00
Yu Liu
4b98396c64 Merge "Remove licenseMetadataFile and installFiles from ModuleBase." into main 2024-08-27 15:54:00 +00:00
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
Yu Liu
ec81054548 Remove licenseMetadataFile and installFiles from ModuleBase. 
Bug: 358425833
Test: Manually verified all the generated ninja and mk files and CI.
Change-Id: I447ec74b7f9c3b8c686ed41511e2051f40ac88f8
 2024-08-27 00:16:22 +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
Inseob Kim
9a22c7e61b Include TARGET_ODM_PROP to odm/etc/build.prop 
It's missing in Soong's build_prop module.

Bug: 322090587
Bug: 361623560
Test: set TARGET_ODM_PROP and see odm/etc/build.prop
Change-Id: I447a64998f6ae0ba80201ab4ab6c0fd0ef22e3e5
 2024-08-26 15:58:09 +09: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