StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Map prebuilt_apis labels to Bazel's manually generated ones.

Browse Source 
Change-Id: I5bec807da9b39e2b166af1bd83da43df91f997ef
Bug: 237810289
Test: check that android-non-updatable.stubs.module_lib uses manual
bazel target for its sdk_system_current_android dependency

Change-Id: I6f5fb348e1dcaad10eb756382359f34de792b6e0
This commit is contained in:
Romain Jobredeaux
2023-05-04 10:16:26 -04:00
parent 30208863b4
commit 8242b43df8
4 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/allowlists/allowlists.go
View File

@@ -303,6 +303,7 @@ var (
"prebuilts/clang/host/linux-x86": Bp2BuildDefaultTrueRecursively,
"prebuilts/gradle-plugin": Bp2BuildDefaultTrueRecursively,
"prebuilts/runtime/mainline/platform/sdk": Bp2BuildDefaultTrueRecursively,
"prebuilts/sdk": Bp2BuildDefaultTrue,
"prebuilts/sdk/current/androidx": Bp2BuildDefaultTrue,
"prebuilts/sdk/current/androidx-legacy": Bp2BuildDefaultTrue,
"prebuilts/sdk/current/extras/constraint-layout-x": Bp2BuildDefaultTrue,

4
android/bazel.go
View File

@@ -71,7 +71,7 @@ type BazelConversionStatus struct {
MissingDeps []string `blueprint:"mutated"`
}
type bazelModuleProperties struct {
type BazelModuleProperties struct {
// The label of the Bazel target replacing this Soong module. When run in conversion mode, this
// will import the handcrafted build target into the autogenerated file. Note: this may result in
// a conflict due to duplicate targets if bp2build_available is also set.
@@ -96,7 +96,7 @@ type bazelModuleProperties struct {
type properties struct {
// In "Bazel mixed build" mode, this represents the Bazel target replacing
// this Soong module.
Bazel_module bazelModuleProperties
Bazel_module BazelModuleProperties
}
// namespacedVariableProperties is a map from a string representing a Soong

4
android/bazel_test.go
View File

@@ -218,7 +218,7 @@ func (bcc *TestBazelConversionContext) Config() Config {
var bazelableBazelModuleBase = BazelModuleBase{
bazelProperties: properties{
Bazel_module: bazelModuleProperties{
Bazel_module: BazelModuleProperties{
CanConvertToBazel: true,
},
},
@@ -344,7 +344,7 @@ func TestBp2BuildAllowlist(t *testing.T) {
},
BazelModuleBase: BazelModuleBase{
bazelProperties: properties{
Bazel_module: bazelModuleProperties{
Bazel_module: BazelModuleProperties{
CanConvertToBazel: true,
Bp2build_available: proptools.BoolPtr(true),
},