Remove the subdir argument

... and derive it from the location of the files. PiperOrigin-RevId: 578056917
bazelbuild · Oct 31, 2023 · ef336ef · ef336ef
1 parent 36f4007
commit ef336ef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 167 deletions.
diff --git a/intellij_platform_sdk/BUILD.android_studio232 b/intellij_platform_sdk/BUILD.android_studio232
@@ -3,160 +3,14 @@
 # Plugin source jars for Android Studio (version encoded in directory name)
 
 load("@//intellij_platform_sdk:build_defs.bzl", "no_mockito_extensions")
+load("@//intellij_platform_sdk:android_studio.bzl", "android_studio")
 
 package(default_visibility = ["//visibility:public"])
 
 licenses(["restricted"])
 
 exports_files(["LICENSE"])
 
-java_import(
-    name = "sdk_import",
-    jars = glob(
-        [
-            "android-studio/lib/*.jar",
-        ],
-        exclude = [
-            # mockito-extensions needs to be removed from these jars.
-            "android-studio/lib/testFramework.jar",
-        ],
-    ),
-    tags = ["intellij-provided-by-sdk"],
-    deps = [
-        # guava v20+ requires this at compile-time when using annotation processors.
-        "@error_prone_annotations//jar",
-    ],
-)
-
-java_library(
-    name = "sdk",
-    exports = [
-        ":jars_without_mockito_extensions",
-        ":sdk_import",
-    ],
-)
-
-no_mockito_extensions(
-    name = "jars_without_mockito_extensions",
-    jars = [
-        "android-studio/lib/testFramework.jar",
-    ],
-)
-
-java_import(
-    name = "cidr_plugins",
-    jars = glob([
-        "android-studio/plugins/c-plugin/lib/*.jar",  # com.intellij.cidr.lang: C/C++ Language Support
-        "android-studio/plugins/c-clangd-plugin/lib/*.jar",  # required for NDK debugging
-        "android-studio/plugins/cidr-base-plugin/lib/*.jar",  # com.intellij.cidr.base: CIDR Base
-        "android-studio/plugins/cidr-debugger-plugin/lib/*.jar",  # com.jetbrains.cidr.execution.debugger: CIDR Debugger
-    ]),
-)
-
-java_import(
-    name = "guava",
-    jars = ["android-studio/lib/lib.jar"],
-)
-
-java_library(name = "jsr305")  # not bundled
-
-java_import(
-    name = "java",
-    jars = glob(["android-studio/plugins/java/lib/*.jar"]) + ["android-studio/plugins/java/lib/resources/jdkAnnotations.jar"],
-)
-
-java_import(
-    name = "platform_images",
-    jars = glob(["android-studio/plugins/platform-images/lib/*.jar"]),
-)
-
-java_import(
-    name = "android",
-    jars = glob([
-        "android-studio/plugins/android/lib/*.jar",
-        "android-studio/plugins/android-layoutlib/lib/*.jar",
-        "android-studio/plugins/android-wizardTemplate-plugin/lib/*.jar",
-        "android-studio/plugins/android-wizardTemplate-impl/lib/*.jar",
-        "android-studio/plugins/android-ndk/lib/*.jar",
-        "android-studio/plugins/sdk-updates/lib/*.jar",
-    ]),
-)
-
-java_import(
-    name = "test_recorder",
-    jars = glob([
-        "android-studio/plugins/test-recorder/lib/*.jar",
-    ]),
-    runtime_deps = [
-        ":kotlin",
-    ],
-)
-
-java_import(
-    name = "kotlin",
-    jars = glob(["android-studio/plugins/Kotlin/lib/*.jar"]),
-)
-
-filegroup(
-    name = "kotlinc_version",
-    srcs = ["android-studio/plugins/Kotlin/kotlinc/build.txt"],
-)
-
-java_import(
-    name = "coverage",
-    jars = glob(["android-studio/plugins/java-coverage/lib/*.jar"]),
-)
-
-java_import(
-    name = "devkit",
-    jars = ["android-studio/plugins/devkit/lib/devkit.jar"],
-)
-
-java_import(
-    name = "hg4idea",
-    jars = ["android-studio/plugins/plugins/vcs-hg/lib/vcs-hg.jar"],
-)
-
-java_import(
-    name = "junit",
-    jars = glob(["android-studio/plugins/junit/lib/*.jar"]),
-)
-
-java_import(
-    name = "terminal",
-    jars = ["android-studio/plugins/terminal/lib/terminal.jar"],
-)
-
-# The plugins required by ASwB. We need to include them
-# when running integration tests.
-java_import(
-    name = "bundled_plugins",
-    jars = glob(
-        [
-            "android-studio/plugins/gradle/lib/*.jar",
-            "android-studio/plugins/gradle-java/lib/*.jar",
-            "android-studio/plugins/Groovy/lib/*.jar",
-            "android-studio/plugins/platform-langInjection/lib/*.jar",
-            "android-studio/plugins/java-i18n/lib/*.jar",
-            "android-studio/plugins/junit/lib/*.jar",
-            "android-studio/plugins/properties/lib/*.jar",
-            "android-studio/plugins/smali/lib/*.jar",
-            "android-studio/plugins/toml/lib/*.jar",
-            "android-studio/plugins/webp/lib/*.jar",
-        ],
-        exclude = [
-            # Conflict with lib/guava-*.jar
-            "android-studio/plugins/gradle/lib/guava-*.jar",
-        ],
-    ),
-    tags = ["intellij-provided-by-sdk"],
-)
-
-filegroup(
-    name = "application_info_json",
-    srcs = ["android-studio/product-info.json"],
-)
-
-filegroup(
-    name = "application_info_jar",
+android_studio(
+    name = "android_studio"
 )
diff --git a/intellij_platform_sdk/build_defs.bzl b/intellij_platform_sdk/build_defs.bzl
@@ -164,24 +164,6 @@ DIRECT_IJ_PRODUCTS = {
     ),
 }
 
-def plugin_api_dir_name():
-    """Returns the current IJ version subdirectory.
-
-    Returns:
-        The directory within //intellij_platform_sdk that is
-        used to load the plugin API from, according to the current
-        configuration.
-    """
-    select_params = {
-        ("//intellij_platform_sdk:%s" % product): DIRECT_IJ_PRODUCTS[value].directory
-        for (product, value) in INDIRECT_IJ_PRODUCTS.items()
-        if value in DIRECT_IJ_PRODUCTS
-    }
-
-    # Use ij-latest as the default, consistent with select_from_plugin_api_directory
-    select_params["//conditions:default"] = DIRECT_IJ_PRODUCTS[INDIRECT_IJ_PRODUCTS["intellij-latest"]].directory
-    return select(select_params)
-
 def select_for_plugin_api(params):
     """Selects for a plugin_api.