Internal Change

GitOrigin-RevId: dbce277424007342a975ee8b30c34ed9c8640238

Author: mgalindo-sc

apps/helloworld/standalone_app/BUILD.bazel

@@ -1,7 +1,6 @@
 # HelloWorld Standalone App - Integration Test for valdi_exported_library
 
-load("@android_macros//:android.bzl", "android_binary")
-load("@rules_android//rules:rules.bzl", "aar_import")
+load("@rules_android//rules:rules.bzl", "aar_import", "android_binary")
 load("@rules_kotlin//kotlin:android.bzl", "kt_android_library")
 load("//bzl:expand_template.bzl", "expand_template")
 

bzl/valdi/valdi_android_application.bzl

@@ -1,4 +1,4 @@
-load("@android_macros//:android.bzl", "android_binary")
+load("@rules_android//rules:rules.bzl", "android_binary")
 load("@rules_kotlin//kotlin:android.bzl", "kt_android_library")
 load("@valdi//valdi:valdi.bzl", "valdi_android_aar")
 load("//bzl:expand_template.bzl", "expand_template")

bzl/workspace_init.bzl

@@ -1,4 +1,3 @@
-load("@android_macros//:android.bzl", "STARLARK_RULES_ANDROID_ENABLED")
 load("@aspect_rules_esbuild//esbuild:repositories.bzl", "LATEST_ESBUILD_VERSION", "esbuild_register_toolchains")
 load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies")
 load("@bazel_features//:deps.bzl", "bazel_features_deps")
@@ -122,7 +121,7 @@ def _register_android_deps():
             "https://repo1.maven.org/maven2",
             "https://maven.google.com",
         ],
-        use_starlark_android_rules = STARLARK_RULES_ANDROID_ENABLED,
+        use_starlark_android_rules = True,
         # Let's force the pinned version:
         # https://github.com/bazelbuild/rules_jvm_external#resolving-user-specified-and-transitive-dependency-version-conflicts
         version_conflict_policy = "pinned",

src/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@android_macros//:android.bzl", "android_library")
+load("@rules_android//rules:rules.bzl", "android_library")
 
 # Note don't add any c++ deps to this target as it doesn't work
 # Add C++ deps to the package_aar rule below

valdi/valdi.bzl

@@ -1,8 +1,8 @@
+load("@android_macros//:android.bzl", "aar_import")
 load("@valdi//bzl:valdi_library.bzl", "COMMON_COMPILE_FLAGS")
 load("@valdi//bzl/android:filter_jar.bzl", "filter_jar")
 load("@valdi//bzl/android:package_aar.bzl", "package_aar")
 load("@valdi//bzl/android:platform_transition.bzl", "android_aar_platforms")
-load("@valdi//bzl/macros:android.bzl", "aar_import")
 
 COMPILER_FLAGS = [
     # '-Os', # Uncomment to enable optimizations