Add rules_android to private Starlark API allowlists

PiperOrigin-RevId: 485559575 Change-Id: Ia107131e3421e48dddb2fbe6832132d6cd975ca7
uber-common · Nov 2, 2022 · 4c0f9a7 · 4c0f9a7
1 parent e3fae33
commit 4c0f9a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleContext.java
@@ -120,8 +120,9 @@ public final class StarlarkRuleContext implements StarlarkRuleContextApi<Constra
       ImmutableSet.of(
           PackageIdentifier.createUnchecked("_builtins", ""),
           PackageIdentifier.createInMainRepo("test"), // for tests
-          PackageIdentifier.createInMainRepo("tools/build_defs/android/dev"),
-          PackageIdentifier.createInMainRepo("tools/build_defs/android/release/blaze"));
+          PackageIdentifier.createInMainRepo("third_party/bazel_rules/rules_android"),
+          PackageIdentifier.createUnchecked("build_bazel_rules_android", ""),
+          PackageIdentifier.createInMainRepo("tools/build_defs/android"));
 
   public static final String EXECUTABLE_OUTPUT_NAME = "executable";
 

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java
@@ -133,8 +133,9 @@ public abstract class CcModule
       ImmutableList.of(
           PackageIdentifier.createUnchecked("_builtins", ""),
           PackageIdentifier.createInMainRepo("bazel_internal/test_rules/cc"),
-          PackageIdentifier.createInMainRepo("tools/build_defs/android/dev"),
-          PackageIdentifier.createInMainRepo("tools/build_defs/android/release/blaze"),
+          PackageIdentifier.createInMainRepo("tools/build_defs/android"),
+          PackageIdentifier.createInMainRepo("third_party/bazel_rules/rules_android"),
+          PackageIdentifier.createUnchecked("build_bazel_rules_android", ""),
           PackageIdentifier.createInMainRepo("rust/private"),
           PackageIdentifier.createUnchecked("rules_rust", "rust/private"));