Delete native Android providers, resource processing pipeline, androi…

…d_data, and related tests. PiperOrigin-RevId: 679783981 Change-Id: Ib263bc1d1e488d4507d3d3e6ca0f53fffb119967
bazelbuild · Sep 28, 2024 · 32264b0 · 32264b0
1 parent 3cb5bea
commit 32264b0
Show file tree

Hide file tree

Showing 130 changed files with 76 additions and 19,321 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/BUILD
@@ -42,7 +42,6 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/bazel/repository/cache",
         "//src/main/java/com/google/devtools/build/lib/bazel/repository/downloader",
         "//src/main/java/com/google/devtools/build/lib/bazel/repository/starlark",
-        "//src/main/java/com/google/devtools/build/lib/bazel/rules/android",
         "//src/main/java/com/google/devtools/build/lib/clock",
         "//src/main/java/com/google/devtools/build/lib/cmdline",
         "//src/main/java/com/google/devtools/build/lib/events",

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/rules/BUILD
@@ -9,7 +9,6 @@ package(
 filegroup(
     name = "srcs",
     srcs = glob(["*"]) + [
-        "//src/main/java/com/google/devtools/build/lib/bazel/rules/android:srcs",
         "//src/main/java/com/google/devtools/build/lib/bazel/rules/cpp:srcs",
         "//src/main/java/com/google/devtools/build/lib/bazel/rules/genrule:srcs",
         "//src/main/java/com/google/devtools/build/lib/bazel/rules/java:srcs",
@@ -46,7 +45,6 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/analysis:statically_linked_marker_provider",
         "//src/main/java/com/google/devtools/build/lib/bazel:bazel_configuration",
         "//src/main/java/com/google/devtools/build/lib/bazel/repository",
-        "//src/main/java/com/google/devtools/build/lib/bazel/rules/android",
         "//src/main/java/com/google/devtools/build/lib/bazel/rules/cpp",
         "//src/main/java/com/google/devtools/build/lib/bazel/rules/genrule",
         "//src/main/java/com/google/devtools/build/lib/bazel/rules/java",

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
@@ -36,41 +36,16 @@
 import com.google.devtools.build.lib.analysis.config.RequiresOptions;
 import com.google.devtools.build.lib.bazel.BazelConfiguration;
 import com.google.devtools.build.lib.bazel.repository.LocalConfigPlatformRule;
-import com.google.devtools.build.lib.bazel.rules.android.BazelAndroidSemantics;
 import com.google.devtools.build.lib.bazel.rules.python.BazelPyBinaryRule;
 import com.google.devtools.build.lib.bazel.rules.python.BazelPyBuiltins;
 import com.google.devtools.build.lib.bazel.rules.python.BazelPyRuleClasses;
 import com.google.devtools.build.lib.bazel.rules.python.BazelPyTestRule;
 import com.google.devtools.build.lib.bazel.rules.python.BazelPythonConfiguration;
 import com.google.devtools.build.lib.cmdline.RepositoryName;
 import com.google.devtools.build.lib.packages.PackageCallable;
-import com.google.devtools.build.lib.rules.android.AndroidApplicationResourceInfo;
-import com.google.devtools.build.lib.rules.android.AndroidAssetsInfo;
-import com.google.devtools.build.lib.rules.android.AndroidBinaryDataInfo;
-import com.google.devtools.build.lib.rules.android.AndroidCcLinkParamsProvider;
 import com.google.devtools.build.lib.rules.android.AndroidConfiguration;
-import com.google.devtools.build.lib.rules.android.AndroidDexInfo;
-import com.google.devtools.build.lib.rules.android.AndroidFeatureFlagSetProvider;
-import com.google.devtools.build.lib.rules.android.AndroidIdeInfoProvider;
-import com.google.devtools.build.lib.rules.android.AndroidIdlProvider;
-import com.google.devtools.build.lib.rules.android.AndroidInstrumentationInfo;
-import com.google.devtools.build.lib.rules.android.AndroidLibraryAarInfo;
-import com.google.devtools.build.lib.rules.android.AndroidLibraryResourceClassJarProvider;
-import com.google.devtools.build.lib.rules.android.AndroidManifestInfo;
-import com.google.devtools.build.lib.rules.android.AndroidNativeLibsInfo;
-import com.google.devtools.build.lib.rules.android.AndroidNeverLinkLibrariesProvider;
-import com.google.devtools.build.lib.rules.android.AndroidOptimizationInfo;
-import com.google.devtools.build.lib.rules.android.AndroidOptimizedJarInfo;
-import com.google.devtools.build.lib.rules.android.AndroidPreDexJarProvider;
-import com.google.devtools.build.lib.rules.android.AndroidProguardInfo;
-import com.google.devtools.build.lib.rules.android.AndroidResourcesInfo;
-import com.google.devtools.build.lib.rules.android.AndroidSdkProvider;
 import com.google.devtools.build.lib.rules.android.AndroidStarlarkCommon;
-import com.google.devtools.build.lib.rules.android.ApkInfo;
-import com.google.devtools.build.lib.rules.android.BaselineProfileProvider;
 import com.google.devtools.build.lib.rules.android.BazelAndroidConfiguration;
-import com.google.devtools.build.lib.rules.android.ProguardMappingProvider;
-import com.google.devtools.build.lib.rules.android.databinding.DataBindingV2Provider;
 import com.google.devtools.build.lib.rules.config.ConfigRules;
 import com.google.devtools.build.lib.rules.core.CoreRules;
 import com.google.devtools.build.lib.rules.cpp.CcStarlarkInternal;
@@ -317,39 +292,10 @@ public void init(ConfiguredRuleClassProvider.Builder builder) {
           builder.addConfigurationFragment(AndroidConfiguration.class);
           builder.addConfigurationFragment(BazelAndroidConfiguration.class);
 
-          AndroidBootstrap bootstrap =
-              new AndroidBootstrap(
-                  new AndroidStarlarkCommon(),
-                  ApkInfo.PROVIDER,
-                  AndroidInstrumentationInfo.PROVIDER,
-                  AndroidResourcesInfo.PROVIDER,
-                  AndroidNativeLibsInfo.PROVIDER,
-                  AndroidApplicationResourceInfo.PROVIDER,
-                  AndroidSdkProvider.PROVIDER,
-                  AndroidManifestInfo.PROVIDER,
-                  AndroidAssetsInfo.PROVIDER,
-                  AndroidLibraryAarInfo.PROVIDER,
-                  AndroidProguardInfo.PROVIDER,
-                  AndroidIdlProvider.PROVIDER,
-                  AndroidIdeInfoProvider.PROVIDER,
-                  AndroidPreDexJarProvider.PROVIDER,
-                  AndroidCcLinkParamsProvider.PROVIDER,
-                  DataBindingV2Provider.PROVIDER,
-                  AndroidLibraryResourceClassJarProvider.PROVIDER,
-                  AndroidFeatureFlagSetProvider.PROVIDER,
-                  ProguardMappingProvider.PROVIDER,
-                  AndroidBinaryDataInfo.PROVIDER,
-                  BaselineProfileProvider.PROVIDER,
-                  AndroidNeverLinkLibrariesProvider.PROVIDER,
-                  AndroidOptimizedJarInfo.PROVIDER,
-                  AndroidDexInfo.PROVIDER,
-                  AndroidOptimizationInfo.PROVIDER);
+          AndroidBootstrap bootstrap = new AndroidBootstrap(new AndroidStarlarkCommon());
           builder.addStarlarkBootstrap(bootstrap);
 
           try {
-            builder.addWorkspaceFileSuffix(
-                ResourceFileLoader.loadResource(
-                    BazelAndroidSemantics.class, "android_remote_tools.WORKSPACE"));
             builder.addWorkspaceFileSuffix(
                 ResourceFileLoader.loadResource(JavaRules.class, "coverage.WORKSPACE"));
           } catch (IOException e) {

diff --git a/...ain/java/com/google/devtools/build/lib/bazel/rules/android/AndroidRepositoryFunction.java b/...ain/java/com/google/devtools/build/lib/bazel/rules/android/AndroidRepositoryFunction.java
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BUILD
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java