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

85755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jihoon Kang
241d4d79de Merge "Find subdir aconfig_values from srcs" into main am: 437f87f0c7 am: c178376639 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3260766

Change-Id: I51f9433845b13c5fa7f22d797c4741add7fcae18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-13 04:32:21 +00:00
Jihoon Kang
c178376639 Merge "Find subdir aconfig_values from srcs" into main am: 437f87f0c7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3260766

Change-Id: Icc30f314fbf63e9e0638ee6624f365858619c8cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-13 04:11:39 +00:00
Jihoon Kang
437f87f0c7 Merge "Find subdir aconfig_values from srcs" into main 2024-09-13 03:56:32 +00:00
Treehugger Robot
d83cc97b7f Merge "linker_config_src in filesystem may read filegroup" into main am: 6c10c36d0a am: 9c90fc248a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3260462

Change-Id: I90ac878d7a729561faf90bbcea3b43e12c506df1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-13 02:59:47 +00:00
Treehugger Robot
9c90fc248a Merge "linker_config_src in filesystem may read filegroup" into main am: 6c10c36d0a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3260462

Change-Id: I00c06378254845a293b5ba3cabafe2e40e021cdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-13 02:37:06 +00: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
Treehugger Robot
6c10c36d0a Merge "linker_config_src in filesystem may read filegroup" into main 2024-09-13 02:19:03 +00:00
Dennis Shen
bf9c8f0613 Treat system_ext as system container am: 01efb83420 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3261301

Change-Id: Ic6c35f5e647e8693a852f8528ff5758f5ae8693e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-13 01:43:31 +00:00
Jihoon Kang
4fbee9af0b Find subdir aconfig_values from srcs 
This change supports adding dependencies from the aconfig_value_set
module to the aconfig_values modules from `srcs`, which are the
paths to the Android.bp files where the aconfig_value modules are
defined.

Test: m nothing --no-skip-soong-tests
Bug: 365827715
Change-Id: Idd5f1d9c2625a6362dbaf3adba0a74406e3a9928
 2024-09-12 23:48:19 +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
d299760e00 Merge "Allow multiple ninja implementations" into main am: d4771aa267 am: fea92ff7d7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3263500

Change-Id: Ib29002282c22865c3d4eb5db99bdd95a04ae4579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 22:46:20 +00:00
Treehugger Robot
fea92ff7d7 Merge "Allow multiple ninja implementations" into main am: d4771aa267 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3263500

Change-Id: Ifc23db90237421265b8a485b422ab4d9bf1884ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 22:28:24 +00:00
Treehugger Robot
d4771aa267 Merge "Allow multiple ninja implementations" into main 2024-09-12 22:09:58 +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
Treehugger Robot
9e67f9499a Merge "Don't evaluate the enabled property in a defaultable hook" into main am: c379ea0fd4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3264841

Change-Id: Ia9d10fa1fef3718c9aced086880b592c9a576f95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 20:35:56 +00:00
Spandan Das
38605e5667 Merge "Use -language-version 1.9 in the kotlinKythe build rule" into main am: a7b916b50c am: c1ced44f0a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3263501

Change-Id: I593bc349b4821fe2d7a795fc7a803ef53c7ff4d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 20:35:04 +00:00
Treehugger Robot
c379ea0fd4 Merge "Don't evaluate the enabled property in a defaultable hook" into main 2024-09-12 20:15:20 +00:00
Spandan Das
c1ced44f0a Merge "Use -language-version 1.9 in the kotlinKythe build rule" into main am: a7b916b50c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3263501

Change-Id: I9c7e372bef7ee0eb33cf879eb666853e1c174fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 20:07:39 +00:00
Spandan Das
a7b916b50c Merge "Use -language-version 1.9 in the kotlinKythe build rule" into main 2024-09-12 19:52:30 +00:00
Treehugger Robot
e021e615fa Merge "Fix a bug in the log directory cleanup logic." into main am: c5d2456d8b am: 1db55e4c54 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3248133

Change-Id: I07f18df21c4daa44804008e49df9ad36f2023722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 19:47:12 +00:00
LaMont Jones
ece626ccac Allow multiple ninja implementations 
This permits easier testing and comparison between different ninja
implementations.

Bug: 362926979
Bug: 318434287
Test: manual
Change-Id: Ic058338d0a2fd8c988794a0781dcc93c0f4c03e3
 2024-09-12 12:45:27 -07:00
Treehugger Robot
1db55e4c54 Merge "Fix a bug in the log directory cleanup logic." into main am: c5d2456d8b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3248133

Change-Id: I008c62706c5a1d428023aa6318e316e79c09fdd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 19:22:49 +00:00
Treehugger Robot
c5d2456d8b Merge "Fix a bug in the log directory cleanup logic." into main 2024-09-12 19:02:44 +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
Spandan Das
c911462cbf Merge changes from topic "kotlin_kythe" into main am: 6556d043bd am: d6663871c7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3255897

Change-Id: I4bd62b801647b685f31121c6b2f2a8c77afa1f57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 18:33:39 +00:00
Spandan Das
d6663871c7 Merge changes from topic "kotlin_kythe" into main am: 6556d043bd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3255897

Change-Id: Ica236952d1e57705b8ae9a437d7b8df6843a4f9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 18:23:13 +00:00
Spandan Das
3d6c6d9c76 Use -language-version 1.9 in the kotlinKythe build rule 
There are some instances of .kt code in android platform that are not
fully compatible with kotlinc > 2. To account for this version skew when
generating xrefs, implicitly add `-language-version 1.9` to the args in
the .kzip file. The main kotlinc build rules remain the same.

This value has been picked manually by running
`external/kotlinc/bin/kotlinc -version` at ToT

Bug: 265428637
Test: verified that `-language-version 1.9` is added to the build
command of the .kzip files
Test: ran the indexer locally on the .kzip of `PermissionController-lib`
(this android_library contains .kt code that does not compile with
verison >2)

Change-Id: Icfb72800404d83f63204de23a1ec34b40ee05847
 2024-09-12 18:20:59 +00:00
Spandan Das
6556d043bd Merge changes from topic "kotlin_kythe" into main 
* changes:
  Add kotlin kzips to build_kzip.bash
  Create .kzip files for kotlin translation units
 2024-09-12 18:14:14 +00:00
Yaowen Mei
d9108d2d34 Fix a bug in the log directory cleanup logic. 
This CL fix the bug that shouldCleanupRBELogsDir() never return true.

The way how shouldCleanupRBELogsDir() use to work is it will return true only if `RBE_proxy_log_dir` flag is not set.

But CI build always got this flag from gcl file, and developer build always got this flag set from ui/build/rbe.go (http://shortn/_K604iWNYkd). So there is never a case this shouldCleanupRBELogsDir() return true. That is to say, we never clean up
RBELogsDir by ourselves.

The reason why this is not a concern is that soong will automatically delete the out/soong/.temp folder every time when user run `m` or `lunch`, and the default RBELogsDir use to be `out/soong/.temp/rbe`. So soong is helping us to clean the logs before.


Previously, I merged this CL: https://r.android.com/3192211 to support running `lunch` in two terminals. In that CL, I moved the auto created RBELogsDir one level up to `out/soong/rbe`. This is causing a problem because RBELogsDir never get cleaned.

This CL will fix the shouldCleanupRBELogsDir() method, after this merged in, 1) if a user didn't set the `RBE_proxy_log_dir` flag, the logs in `out/soong/rbe` will be cleaned each time when running `m`, but `lunch` will not touch `out/soong/rbe`, so we still support running `lunch` in different terminals. 2) If user set `RBE_proxy_log_dir` flag to anything rather than `out/song/rbe`, the directory will not be cleaned by running `m`; 3) we have updated our doc everywhere that `out/soong/rbe` is re-client's default log dir, so I think it should be expected if user set `RBE_proxy_log_dir=out/soong/rbe`, then the logs will be deleted when next time `m` invoked, same as if they set `RBE_proxy_log_dir=out/soong/.temp/rbe` before.


Test: abtd run is green: http://shortn/_KqTvQelstP, local build with multiply lunch is not affected, and running m after a build can clean the out/soong/rbe directory.
Bug: 362798954
Change-Id: I38a7ad650fc59ad06716c5be7de6ecc61ead8eef
 2024-09-12 18:08:06 +00: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
9919167ca7 Merge "Introduce a util method PrettyConcat" into main am: 167230037c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3262082

Change-Id: Ida7dcfad9d75cf155a1e63112ead720246dc3ba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 17:12:59 +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
Treehugger Robot
64c9cd249a Merge "Wrap blueprint_go_binary and bootstrap_go_package into android.Modules" into main am: 82e99ce373 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3260639

Change-Id: Ica8a29fbf3b942bbba6cd764b92ce0661dc811b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 15:57:10 +00:00
Charisee Chiw
6dc14b0946 Merge "rustc-1.81.0 Build 12349086" into main am: 3cee551577 am: e7057c9097 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3263182

Change-Id: Ifc43ab23849517365d078d523385d17110e40796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 15:56:33 +00:00
Treehugger Robot
82e99ce373 Merge "Wrap blueprint_go_binary and bootstrap_go_package into android.Modules" into main 2024-09-12 15:46:51 +00:00
Charisee Chiw
e7057c9097 Merge "rustc-1.81.0 Build 12349086" into main am: 3cee551577 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3263182

Change-Id: Ifac1d6e5c5a0ba813d02fc467af162fe97c15133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 15:45:58 +00:00
Charisee Chiw
3cee551577 Merge "rustc-1.81.0 Build 12349086" into main 2024-09-12 15:36:28 +00:00
Justin Yun
903856e3e8 linker_config_src in filesystem may read filegroup 
Add "path" annotation to the linker_config_src property in filesystem
module to read a filegroup as a source.

Bug: 365670526
Test: lunch aosp_cf_x86_64_phone_soong_system-trunk_staging-userdebug
      && m
Change-Id: I96abb376640eea009f03841866b8c7b5d95917fa
 2024-09-12 15:14:06 +09: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
ad0bd45153 Merge "Remove unused property naming_scheme in java_sdk_library" into main am: 8996dbc91c am: f3aaebba23 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3262081

Change-Id: Ic6cf2c6e56c206c3aa7a2e587933369999b8dd77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 01:59:24 +00:00
Treehugger Robot
f3aaebba23 Merge "Remove unused property naming_scheme in java_sdk_library" into main am: 8996dbc91c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3262081

Change-Id: Ieae9d19e004dc0060e83e57712c5f3c83ba5b106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 01:49:15 +00:00
Treehugger Robot
8996dbc91c Merge "Remove unused property naming_scheme in java_sdk_library" into main 2024-09-12 01:43:15 +00: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
d94bbc9ce2 Merge "Soong system image may update the $PRODUCT_OUT" into main am: 6fab06d56b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3261533

Change-Id: I26ae2d33878d223bed9dbb3e34f2db5475b593d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 00:33:57 +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
Cole Faust
c8d5bd08b0 Merge "Add HasMutatorFinished" into main am: 7351875acb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3263046

Change-Id: I1a9323de421827833751eb3bea02777079669980
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 00:15:23 +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
Jihoon Kang
2261a82dbd Remove unused property naming_scheme in java_sdk_library 
The property was introduced as an interim solution, and is currently
unused.

Test: m nothing --no-skip-soong-tests
Bug: 366071058
Change-Id: I57abdb64fabdb34fbbd1190851bc528dbb88c7f8
 2024-09-12 00:10:37 +00:00