StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,969 Commits 1 Branch 0 Tags
3ac97e31f8be5cb4bde8b7fd7cafaee1036ca34d
Commit Graph

80969 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JaeMan Park
1c4cc3d40e Merge "Disable tidy checks for generated code" into main 2024-01-11 02:18:21 +00:00
Hsin-Yi Chen
e8fdaa32fb Merge "Do not build ABI dumps for VNDK" into main am: 1c683b372d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2900489

Change-Id: Icaf97c674bc130b7adf1a581a920349cd8fe86c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-11 02:16:14 +00:00
Seungjae Yoo
5999881627 Merge "[apex] Add support for prebuilt_etc types in ApexNativeDependencies" into main am: 91ef5bb8a7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2796438

Change-Id: I657a84ce9471eb758007c66f687558a7b2790f39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-11 02:15:49 +00:00
Spandan Das
3576e769a4 Handle installation rules for co-existing prebuilts 
Every module belonging to a single mainline module family will be
hidden from make, except the one which has been flagged using
apex_contributions

Details
- Introduce a new `source_apex_name` property to prebuilt_apex and
  override_apex. This property will be used to identify the source
  equivalent of a prebuilt soong apex module.
- Create an N-ary tree from source to prebuilt(s). The tree wil be
  rooted at the source module.
- In a subsequent mutator, visit every node in the tree(s). Query
  apex_contributions and store the handle of the node which is "active"
  (if any)
- In the same mutator, do another pass over the tree. Invoke
  `HideFromMake` on every node which is not "active". The two-pass
  approach is needed PrebuiltSelectionInfoProvider does not know about
  the inter source-prebuilt dependency, this dependency can only be
  known by doing a graph walk of the N-ary tree.

Some tangential implementation details
- Each prebuilt apex has an internal deapxer module that is responsible
  for generating the deapex ninja rules. The name of this internal
  module uses the BaseModuleName (without the prebuilt_ prefix). Since
  we can have multiple prebuilt soong modules in trunk stable, change
  this to follow the name of the prebuilt module in order to avoid name
  collisions. Update existing unit tests accordingly

Bug: 316179314
Test: go test ./apex -run TestInstallationRulesForMultipleApexPrebuilts
Test: m nothing --no-skip-soong-tests
Test: presubmits

Change-Id: I58aa99d5e6a9859954614e6db9a8e9e2e581642d
 2024-01-11 02:02:59 +00:00
Hsin-Yi Chen
1c683b372d Merge "Do not build ABI dumps for VNDK" into main 2024-01-11 02:00:45 +00:00
Seungjae Yoo
91ef5bb8a7 Merge "[apex] Add support for prebuilt_etc types in ApexNativeDependencies" into main 2024-01-11 01:09:26 +00:00
Yu Liu
edeadbfdcf Add container to the path of the merged aconfig files. 
Bug: 312769710
Test: CI
Change-Id: I4b8a71cf86a3bcefc4a41360a241aa14b798f6e8
 2024-01-10 23:38:09 +00:00
Treehugger Robot
606dc4ff55 Merge "Drop wifi apex deps from implicit baselineApexAvailable map" into main am: ee18a66643 am: 2bcf2e322f am: cd9476ca87 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2898995

Change-Id: Ia2204ca6e383d8c9c5443d3c4c00d79dd8954e88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 22:57:59 +00:00
Colin Cross
a9aa35c252 Improve soong stuck ninja detection output 
Add -T to the pstree command so that it doesn't print the threads of
the running processes, the thread information hasn't been useful for
debugging any previous instances of stuck processes.

Log that there are stuck processes to stdout with a pointer to look
in soong.log.

Test: manual
Change-Id: I6459f2887a7e79591e8c451d06969f8709db3393
 2024-01-10 14:43:30 -08:00
Treehugger Robot
cd9476ca87 Merge "Drop wifi apex deps from implicit baselineApexAvailable map" into main am: ee18a66643 am: 2bcf2e322f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2898995

Change-Id: Ib03ff10bfc6ace66f268b716ee1d83bfeee0af9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 22:11:28 +00:00
Treehugger Robot
2bcf2e322f Merge "Drop wifi apex deps from implicit baselineApexAvailable map" into main am: ee18a66643 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2898995

Change-Id: Ib95fd15c13053c8bc264dfa074a9f6d666241f6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 21:25:40 +00:00
LaMont Jones
ed89443a0f Merge changes Iaf6d45a4,Ic56e8ef3,I11f0a0b5 into main am: 15b031e10e am: 0f2753094a am: 82cf614b7e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2901516

Change-Id: Iafb7bcff23771b8342fc9adb99f679645f83b83c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 21:14:15 +00:00
Dennis Shen
40c3413e18 do not include sever_configurable_flags dependency when in am: c6dc551097 am: 8c34f51815 am: c2ca2162a9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2904107

Change-Id: I033deb46ccf00e73e6b92c45095c2a2d4e449333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 21:12:53 +00:00
Treehugger Robot
ee18a66643 Merge "Drop wifi apex deps from implicit baselineApexAvailable map" into main 2024-01-10 20:50:25 +00:00
LaMont Jones
82cf614b7e Merge changes Iaf6d45a4,Ic56e8ef3,I11f0a0b5 into main am: 15b031e10e am: 0f2753094a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2901516

Change-Id: I969ab9d0dfb1fddce193fea7234cc52bbdde0fa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 20:23:54 +00:00
Dennis Shen
c2ca2162a9 do not include sever_configurable_flags dependency when in am: c6dc551097 am: 8c34f51815 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2904107

Change-Id: I7b627eae6a4fef466945e43f47d9e15aa2611e60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 20:21:11 +00:00
Spandan Das
1050adad02 Drop wifi apex deps from implicit baselineApexAvailable map 
The availability of these soong modules to com.android.wifi has
been made explicit in Android.bp files

Bug: 281077552
Test: m nothing
Change-Id: I6ac447ffe4b477a49064ed0ec4081e087f0edf9d
 2024-01-10 19:46:28 +00:00
LaMont Jones
0f2753094a Merge changes Iaf6d45a4,Ic56e8ef3,I11f0a0b5 into main am: 15b031e10e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2901516

Change-Id: Id501a4d3da98bdcdd08ed343f14c086e1200ced3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 19:38:07 +00:00
Dennis Shen
8c34f51815 do not include sever_configurable_flags dependency when in am: c6dc551097 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2904107

Change-Id: I4806abcef1a0d502faa0c6d34e2dc9558df8aa0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 19:37:41 +00:00
LaMont Jones
15b031e10e Merge changes Iaf6d45a4,Ic56e8ef3,I11f0a0b5 into main 
* changes:
  Propagate aconfig providers for more modules.
  move SetAconfigFileMkEntries to android
  aconfig: harden dependency collection
 2024-01-10 18:54:30 +00:00
Dennis Shen
cdb407e795 Merge "Enforce one aconfig_declaration per aconfig package" into main am: 2127887e32 am: 31a87f5977 am: 8c0e06052d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2901767

Change-Id: Ib99cde6b13bf0f64910cf693aa6cb315fc546be4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 14:39:50 +00:00
Dennis Shen
8c0e06052d Merge "Enforce one aconfig_declaration per aconfig package" into main am: 2127887e32 am: 31a87f5977 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2901767

Change-Id: I6312022afdc29caf941b42c5252d7e681ef4f13f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 14:08:02 +00:00
Dennis Shen
c6dc551097 do not include sever_configurable_flags dependency when in 
force-read-only-mode

Bug: b/316932568
Test: m --no-skip-soong-tests nothing
Change-Id: I02a7925dd6b5b33107dae1507447f8e7a1991795
 2024-01-10 14:07:35 +00:00
LaMont Jones
afe7baf47d Propagate aconfig providers for more modules. 
Bug: 308625757
Test: manual
Change-Id: Iaf6d45a4259f1c6c34476c34c431344283ae2830
 2024-01-10 14:03:30 +00:00
LaMont Jones
acae2d7656 move SetAconfigFileMkEntries to android 
This will need to be called by some modules handled in android.

Bug: 308625757
Test: manual
Change-Id: Ic56e8ef3a453c59866aab6d39a21108cf8536b56
 2024-01-10 14:03:29 +00:00
LaMont Jones
1e0a69a02e aconfig: harden dependency collection 
To prevent errors, when we collect dependencies for a module, walk the
blueprint modules, and ignore blueprint and disabled modules.

This avoids errors in validateAndroidModule when a android.Module (such
as a genrule) depends on a blueprint.Module, and strict checking is
enabled.

Bug: 308625757
Test: manual

Change-Id: I11f0a0b504aa18d6d786cc91319b9d1d9497c04f
 2024-01-10 14:02:47 +00:00
Dennis Shen
31a87f5977 Merge "Enforce one aconfig_declaration per aconfig package" into main am: 2127887e32 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2901767

Change-Id: Id85ca73839ed6521b22d25641d8bf3505dc044fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 13:20:11 +00:00
Dennis Shen
2127887e32 Merge "Enforce one aconfig_declaration per aconfig package" into main 2024-01-10 12:46:06 +00:00
JaeMan Park
3dba4d2c60 Disable tidy checks for generated code 
Generated codes like cpp code from *.ll for *.yy files always run
clang-tidy, when generated code has warning, where is no way to fix it.

So, disable clang-tidy for generated code.

Bug: 162909698
Test: go test android/soong/cc
Change-Id: I0fee137d6170ef4bf6cf641abad572e448aceaa1
 2024-01-10 16:29:51 +09:00
Jim Tang
43ec9bf411 Merge "Ignore LOCAL_XTS_TEST_PACKAGE translation" into main am: 82403f0f6e am: 9267cfde77 am: cacec00b96 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2897083

Change-Id: Ibd04b2245f78cb93d67e7625e16e1adcaca9c386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 06:04:26 +00:00
Jim Tang
cacec00b96 Merge "Ignore LOCAL_XTS_TEST_PACKAGE translation" into main am: 82403f0f6e am: 9267cfde77 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2897083

Change-Id: Iaf8f50dfc934a6036ba0dcef93bd47c29842a4e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 05:31:42 +00:00
Jim Tang
9267cfde77 Merge "Ignore LOCAL_XTS_TEST_PACKAGE translation" into main am: 82403f0f6e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2897083

Change-Id: I8f2d9bedb69bb69a8618b4e5782bf8f45d975443
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 04:45:04 +00:00
Jim Tang
82403f0f6e Merge "Ignore LOCAL_XTS_TEST_PACKAGE translation" into main 2024-01-10 04:11:36 +00:00
Treehugger Robot
a9578f2731 Merge "Generate VNDK independent image variant with cc genrule" into main am: 395c47f635 am: 466ea1b6ca am: 6c7d3e388d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2902107

Change-Id: I9ab4e91ad2211728acc0a91f5ba7bb0c5b770bbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 03:58:55 +00:00
Treehugger Robot
e97a38947f Merge "Update released flagged apis rule" into main am: d06bdb0310 am: 690b099a4c am: 1744b8d43a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2901995

Change-Id: I199da491a72ab2a8ee4484c372b98ee582aa02d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 03:56:03 +00:00
Treehugger Robot
6c7d3e388d Merge "Generate VNDK independent image variant with cc genrule" into main am: 395c47f635 am: 466ea1b6ca 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2902107

Change-Id: I183f84355928ef456ee6f439da7f023541d5cf16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 03:25:29 +00:00
Treehugger Robot
1744b8d43a Merge "Update released flagged apis rule" into main am: d06bdb0310 am: 690b099a4c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2901995

Change-Id: I60307e97c17e2c0b93cf173d033b94ebe484030a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 03:24:53 +00:00
Treehugger Robot
466ea1b6ca Merge "Generate VNDK independent image variant with cc genrule" into main am: 395c47f635 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2902107

Change-Id: Iaf17a0a2f0ff3cd6634c0a47b5e13235ac2ebb4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 02:53:48 +00:00
Treehugger Robot
690b099a4c Merge "Update released flagged apis rule" into main am: d06bdb0310 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2901995

Change-Id: If96fda7a9e1334b302d9e37ec0c2943156f0b4e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 02:52:13 +00:00
Treehugger Robot
395c47f635 Merge "Generate VNDK independent image variant with cc genrule" into main 2024-01-10 02:51:34 +00:00
Kiyoung Kim
e9d15e08d2 Merge "Split usage of UseVndk" into main am: 4c41458f9c am: d4280b7009 am: 1d1effd1ba 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2897612

Change-Id: I5eb02272b9f58c0f91f3df26b981a70e5130c717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 02:18:54 +00:00
Treehugger Robot
6fa5af612e Merge "Replace panic with ModuleErrorf" into main am: ec3887ad2f am: db7220eb70 am: 1ef21535e7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2901513

Change-Id: I3e894707ca4a3866046de2f53d7c8c1ebd59477b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 02:17:46 +00:00
Treehugger Robot
d06bdb0310 Merge "Update released flagged apis rule" into main 2024-01-10 02:00:54 +00:00
Dennis Shen
4e7773d81e Enforce one aconfig_declaration per aconfig package 
Bug: b/319121098
Change-Id: Ibe3f1587ed7754f00f464cf385ce51ee9a142412
 2024-01-10 01:53:49 +00:00
Kiyoung Kim
1d1effd1ba Merge "Split usage of UseVndk" into main am: 4c41458f9c am: d4280b7009 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2897612

Change-Id: I9d35d9f122d9bc284d8819390c07d6c75120b1b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 01:45:28 +00:00
Treehugger Robot
1ef21535e7 Merge "Replace panic with ModuleErrorf" into main am: ec3887ad2f am: db7220eb70 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2901513

Change-Id: Ib6e5fa6ab17cf5a795cd8b220859db2517d284f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 01:44:54 +00:00
Kiyoung Kim
d4280b7009 Merge "Split usage of UseVndk" into main am: 4c41458f9c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2897612

Change-Id: Id61a23f0133e6095a53d0eb62bfcb80e015b29c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 01:32:44 +00:00
Kiyoung Kim
4c41458f9c Merge "Split usage of UseVndk" into main 2024-01-10 01:15:45 +00:00
Treehugger Robot
db7220eb70 Merge "Replace panic with ModuleErrorf" into main am: ec3887ad2f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2901513

Change-Id: I7be814555bd092415b134694818832defe4f37f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-10 01:14:21 +00:00
Kiyoung Kim
853e391eca Generate VNDK independent image variant with cc genrule 
Image variants for CC modules were covered to work without VNDK version
from previous commit, but CC genrule has its own image variant rule, so
it should be also updated to generate vendor / product image variant
without VNDK version.

Bug: 316829758
Test: m nothing --no-skip-soong-tests passed
Test: AOSP cuttlefish build succeeded

Change-Id: I425dd425efcc57c7ff8f9964b303ad6f539c3b57
 2024-01-10 10:13:31 +09:00