diff options
Diffstat (limited to 'android')
| -rw-r--r-- | android/allowlists/allowlists.go | 1 | ||||
| -rw-r--r-- | android/bazel.go | 4 | ||||
| -rw-r--r-- | android/bazel_test.go | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index 6bd4e26e8..10c3aef83 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -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, diff --git a/android/bazel.go b/android/bazel.go index 58d9d87db..a9ba79044 100644 --- a/android/bazel.go +++ b/android/bazel.go @@ -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 diff --git a/android/bazel_test.go b/android/bazel_test.go index 87b2c8f42..77e251575 100644 --- a/android/bazel_test.go +++ b/android/bazel_test.go @@ -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), }, |