Merge remote-tracking branch 'aosp/upstream-main' into HEAD
* aosp/upstream-main: (27 commits)
Migrate AppendJava8LegacyDex and BuildLegacyDex action from native to Starlark
Migrate DexArchiveAspect from native Blaze to Starlark, and also add 2 new processors in android_binary_internal: DexProcessor and DeployJarProcessor
Internal Change
Make default_applicable_licenses usage consistent
N/a
Internal Change
Add java toolchain type to all rules which are using java_common
Add com.android.tools.build:gradle to MODULE.bazel
Update .gitignore
Add `com.android.tools.build:gradle:8.0.1` to `rules_android_maven` for the resource shrinker to be used with R8.
Don't use stamping if stamping is not available.
Internal Change
Deleting ACL
Migrate CreateDeployJar from native Blaze to Starlark
Disable windows for rules_android since it doesn't supported it
Add abseil-py to MODULE.bazel in rules_android
Add Android revision checking.
Migrate ZipFilter action to Starlark used in proguard and android_instrumentation test.
Add a flag to the android kit manifest command that allows enabling debugging of the application.
Fix bazel_gazelle error inside MODULE.bazel file
...
Change-Id: If4884a9815cbe08e6b19ac6b86f0ca9ff7ebc9ae
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..1a0dec4
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,18 @@
+name: "rules_android"
+description:
+ "Bazel build rules for building Android Apps. "
+ "These are the open-sourced Android build rules from Google3."
+
+third_party {
+ url {
+ type: HOMEPAGE
+ value: "https://github.com/bazelbuild/rules_android"
+ }
+ url {
+ type: GIT
+ value: "https://github.com/bazelbuild/rules_android"
+ }
+ version: "0ba045398138d641fd8895bb08a6bd4bfa51d0f9"
+ last_upgrade_date { year: 2023 month: 5 day: 31 }
+ license_type: NOTICE
+}
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_APACHE2
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index d83484b..76b1921 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -1,12 +1,9 @@
load("@bazel_tools//tools/jdk:default_java_toolchain.bzl", "default_java_toolchain")
-default_java_toolchain(
+# AOSP-only change
+alias(
name = "toolchain_android_only",
- bootclasspath = [
- "//tools/android:android_jar",
- # TODO(b/175805830): Add this only when desugaring is enabled.
- "@bazel_tools//tools/android:desugar_java8_extra_bootclasspath",
- ],
+ actual = "@bazel_tools//tools/jdk:current_java_toolchain",
visibility = ["//visibility:public"],
)
