diff options
author | Esteban de la Canal <estebandlc@google.com> | 2020-10-09 20:55:39 -0700 |
---|---|---|
committer | Esteban de la Canal <estebandlc@google.com> | 2020-10-11 00:43:20 +0000 |
commit | 2b91de19ef5bfb0466c228425db0a978dfc82f54 (patch) | |
tree | 2c66a7f026b449b19c740f3716caa69c4c7c04a2 | |
parent | 65650f5fe26c81bb7b4503016943c16ff9fbf77d (diff) | |
download | idea-2b91de19ef5bfb0466c228425db0a978dfc82f54.tar.gz |
Remove select_project
Test: N/A
Bug: N/A
Change-Id: I0fba704ef658cd85d543e44661b5867ec8ec323e
-rw-r--r-- | profilers-android/BUILD | 23 | ||||
-rw-r--r-- | studio-updater/BUILD | 10 | ||||
-rw-r--r-- | studio/studio.bzl | 5 |
3 files changed, 4 insertions, 34 deletions
diff --git a/profilers-android/BUILD b/profilers-android/BUILD index 71467760304..9bc40c1d6e2 100644 --- a/profilers-android/BUILD +++ b/profilers-android/BUILD @@ -1,6 +1,5 @@ load("//tools/base/bazel:bazel.bzl", "iml_module") load("//tools/base/bazel:kotlin.bzl", "kotlin_test") -load("//tools/base/bazel:utils.bzl", "select_project") # managed by go/iml_to_build [unb] iml_module( @@ -73,6 +72,8 @@ kotlin_test( ":intellij.android.profilersAndroid_testlib", ], deps = [ + "//prebuilts/studio/intellij-sdk:studio-sdk", + "//tools/adt/idea/.idea/libraries:unb.truth", "//tools/adt/idea/adt-ui:intellij.android.adt.ui", "//tools/adt/idea/adt-ui-model:intellij.android.adt.ui.model", "//tools/adt/idea/android-transport:intellij.android.transport", @@ -81,25 +82,7 @@ kotlin_test( "//tools/adt/idea/profilers-ui:intellij.android.profilers.ui", "//tools/base/perf-logger:studio.perf-logger", "//tools/base/testutils:studio.android.sdktools.testutils", - ] + select_project({ - "unb": [ - "//prebuilts/studio/intellij-sdk:studio-sdk", - "//tools/adt/idea/.idea/libraries:unb.truth", - ], - "": [ - "//tools/idea/.idea/libraries:Guava", - "//tools/idea/.idea/libraries:JUnit4", - "//tools/idea/.idea/libraries:jetbrains-annotations-java5", - "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8", - "//tools/idea/.idea/libraries:studio-grpc", - "//tools/idea/.idea/libraries:studio-proto", - "//tools/idea/.idea/libraries:transport-proto", - "//tools/idea/.idea/libraries:truth", - "//tools/idea/platform/core-api:intellij.platform.core", - "//tools/idea/platform/util:intellij.platform.util", - "//tools/idea/platform/util-rt:intellij.platform.util.rt", - ], - }), + ], ) # managed by go/iml_to_build [unb] diff --git a/studio-updater/BUILD b/studio-updater/BUILD index d14e8fc27db..10741bebfd5 100644 --- a/studio-updater/BUILD +++ b/studio-updater/BUILD @@ -1,5 +1,4 @@ load("//tools/base/bazel:bazel.bzl", "iml_module") -load("//tools/base/bazel:utils.bzl", "select_project") load("//tools/base/bazel:coverage.bzl", "coverage_java_test") # managed by go/iml_to_build [unb] @@ -30,14 +29,7 @@ iml_module( coverage_java_test( name = "integration_test", - data = select_project({ - "": ["//tools/idea/updater:updater_deploy.jar"], - "unb": ["//tools/adt/idea/studio:updater_deploy.jar"], - }), - jvm_flags = select_project({ - "": ["-Dupdater.jar.path=tools/idea/updater/updater_deploy.jar"], - "unb": [], - }), + data = ["//tools/adt/idea/studio:updater_deploy.jar"], tags = ["no_test_windows"], # b/77288863 test_class = "com.android.studio.updater.StudioPatchUpdaterIntegrationTest", runtime_deps = [":intellij.android.updater.studio-updater_testlib"], diff --git a/studio/studio.bzl b/studio/studio.bzl index e1aa30767b9..22158026727 100644 --- a/studio/studio.bzl +++ b/studio/studio.bzl @@ -1,6 +1,5 @@ load("//tools/base/bazel:merge_archives.bzl", "run_singlejar") load("//tools/base/bazel:functions.bzl", "create_option_file") -load("//tools/base/bazel:project.bzl", "PROJECT") def _zipper(ctx, desc, map, out): files = [f for (p, f) in map] @@ -455,10 +454,6 @@ def android_studio( modules = {}, resources = {}, **kwargs): - if PROJECT != "unb": - print("android_studio rule only works if /tools/base/bazel/project.bzl:PROJECT is set to 'unb'") - return - jars, modules_list = _dict_to_lists(modules) resources_dirs, resources_list = _dict_to_lists(resources) searchable_options_dict = {} |