diff options
42 files changed, 59 insertions, 24 deletions
diff --git a/adt-branding/BUILD b/adt-branding/BUILD index 819d3a709c1..8e3c2e3d89f 100644 --- a/adt-branding/BUILD +++ b/adt-branding/BUILD @@ -16,6 +16,7 @@ iml_module( "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/idea/platform/configuration-store-impl:intellij.platform.configurationStore.impl", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", ], # do not sort: must match IML order diff --git a/adt-testutils/BUILD b/adt-testutils/BUILD index f448e971273..7cc6c82bf12 100644 --- a/adt-testutils/BUILD +++ b/adt-testutils/BUILD @@ -26,7 +26,6 @@ iml_module( visibility = ["//visibility:public"], # do not sort: must match IML order deps = [ - "//tools/idea/platform/annotations:intellij.platform.annotations.java5[module, test]", "//tools/idea/platform/platform-impl:intellij.platform.ide.impl[module, test]", "//tools/base/testutils:studio.android.sdktools.testutils[module, test]", "//tools/base/repository:studio.android.sdktools.repository[module, test]", diff --git a/adt-ui-model/BUILD b/adt-ui-model/BUILD index c78c0b01f72..26692039ec4 100644 --- a/adt-ui-model/BUILD +++ b/adt-ui-model/BUILD @@ -9,7 +9,7 @@ iml_module( visibility = ["//visibility:public"], # do not sort: must match IML order deps = [ - "//tools/idea/platform/annotations:intellij.platform.annotations.java5[module]", + "//tools/idea/.idea/libraries:jetbrains-annotations-java5", "//tools/idea/.idea/libraries:Trove4j", "//tools/idea/platform/platform-api:intellij.platform.ide[module]", "//tools/idea/.idea/libraries:Guava", diff --git a/adt-ui/BUILD b/adt-ui/BUILD index afb8716bc85..1b51e784b9f 100644 --- a/adt-ui/BUILD +++ b/adt-ui/BUILD @@ -31,11 +31,12 @@ iml_module( "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/idea/platform/configuration-store-impl:intellij.platform.configurationStore.impl", "//tools/idea/platform/built-in-server:intellij.platform.builtInServer.impl", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", ], # do not sort: must match IML order deps = [ - "//tools/idea/platform/annotations:intellij.platform.annotations.java5[module]", + "//tools/idea/.idea/libraries:jetbrains-annotations-java5", "//tools/idea/.idea/libraries:Trove4j", "//tools/idea/platform/platform-api:intellij.platform.ide[module]", "//tools/idea/platform/platform-impl:intellij.platform.ide.impl[module]", diff --git a/android-adb/BUILD b/android-adb/BUILD index fbb56368042..99d3e3e5884 100644 --- a/android-adb/BUILD +++ b/android-adb/BUILD @@ -46,6 +46,7 @@ iml_module( "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/idea/platform/configuration-store-impl:intellij.platform.configurationStore.impl", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", ], # do not sort: must match IML order diff --git a/android-common/BUILD b/android-common/BUILD index f9f3383ab92..2c221c8f23b 100644 --- a/android-common/BUILD +++ b/android-common/BUILD @@ -33,6 +33,7 @@ iml_module( "//tools/idea/platform/configuration-store-impl:intellij.platform.configurationStore.impl", "//tools/idea/platform/built-in-server:intellij.platform.builtInServer.impl", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", ], # do not sort: must match IML order diff --git a/android-debuggers/BUILD b/android-debuggers/BUILD index 9c37e6eb6bb..2a2232be766 100644 --- a/android-debuggers/BUILD +++ b/android-debuggers/BUILD @@ -27,6 +27,7 @@ iml_module( "//tools/idea/platform/configuration-store-impl:intellij.platform.configurationStore.impl", "//tools/idea/platform/built-in-server:intellij.platform.builtInServer.impl", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", ], # do not sort: must match IML order @@ -53,6 +54,7 @@ iml_module( "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", ], test_srcs = ["testSrc"], diff --git a/android-kotlin/BUILD b/android-kotlin/BUILD index 2b37728e887..f3217a8f2c1 100644 --- a/android-kotlin/BUILD +++ b/android-kotlin/BUILD @@ -12,6 +12,7 @@ iml_module( "//tools/idea/platform/tasks-platform-impl:intellij.platform.tasks.impl", "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", @@ -37,6 +38,7 @@ iml_module( "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", ], @@ -73,6 +75,7 @@ iml_module( "//tools/idea/platform/tasks-platform-impl:intellij.platform.tasks.impl", "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", @@ -127,6 +130,7 @@ iml_module( "//tools/idea/platform/configuration-store-impl:intellij.platform.configurationStore.impl", "//tools/idea/platform/built-in-server:intellij.platform.builtInServer.impl", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", ], # do not sort: must match IML order diff --git a/android-lang/BUILD b/android-lang/BUILD index fb19f4647f0..04c436ccb43 100644 --- a/android-lang/BUILD +++ b/android-lang/BUILD @@ -11,24 +11,17 @@ iml_module( ], iml_files = ["android-lang.iml"], # do not sort: must match IML order - test_runtime_deps = [ - "//tools/idea/xml/xml-analysis-impl:intellij.xml.analysis.impl", - "//tools/idea/images:intellij.platform.images", - "//tools/idea/platform/testFramework/extensions:intellij.platform.testExtensions", - ], + test_runtime_deps = ["//tools/idea/platform/testFramework/extensions:intellij.platform.testExtensions"], visibility = ["//visibility:public"], # do not sort: must match IML order runtime_deps = [ + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/platform/lvcs-impl:intellij.platform.lvcs.impl", - "//tools/idea/xml/xml-structure-view-impl:intellij.xml.structureView.impl", - "//tools/idea/xml/dom-impl:intellij.xml.dom.impl", - "//tools/idea/spellchecker:intellij.spellchecker", "//tools/idea/xml/relaxng:intellij.relaxng", "//tools/idea/platform/tasks-platform-impl:intellij.platform.tasks.impl", "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/idea/platform/configuration-store-impl:intellij.platform.configurationStore.impl", - "//tools/idea/platform/built-in-server:intellij.platform.builtInServer.impl", ], # do not sort: must match IML order deps = [ @@ -71,6 +64,7 @@ iml_module( "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/idea/platform/configuration-store-impl:intellij.platform.configurationStore.impl", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", ], diff --git a/android-layout-inspector/BUILD b/android-layout-inspector/BUILD index 023da32c11f..a763d15a878 100644 --- a/android-layout-inspector/BUILD +++ b/android-layout-inspector/BUILD @@ -13,6 +13,7 @@ iml_module( "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", ], @@ -63,6 +64,7 @@ iml_module( "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", ], diff --git a/android-plugin/BUILD b/android-plugin/BUILD index e2f1c569fb9..35d15fa9188 100644 --- a/android-plugin/BUILD +++ b/android-plugin/BUILD @@ -12,6 +12,7 @@ iml_module( "//tools/idea/platform/tasks-platform-impl:intellij.platform.tasks.impl", "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", diff --git a/android-test-framework/BUILD b/android-test-framework/BUILD index 2802ddde1fb..30faa0af02a 100644 --- a/android-test-framework/BUILD +++ b/android-test-framework/BUILD @@ -16,6 +16,7 @@ iml_module( "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/idea/platform/configuration-store-impl:intellij.platform.configurationStore.impl", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", ], # do not sort: must match IML order diff --git a/android-uitests/BUILD b/android-uitests/BUILD index aeb6b69d504..5abd6e900b4 100644 --- a/android-uitests/BUILD +++ b/android-uitests/BUILD @@ -39,11 +39,10 @@ iml_module( iml_files = ["intellij.android.guiTests.iml"], # do not sort: must match IML order test_runtime_deps = [ - "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/vendor/intellij/cidr:intellij.c.doxygen", - "//tools/idea/plugins/settings-repository:intellij.settingsRepository", "//tools/idea/jps/javac-ref-scanner-8:intellij.java.jps.javacRefScanner8", ], test_srcs = ["testSrc"], diff --git a/android/BUILD b/android/BUILD index b7e92fc92f5..7249636447e 100644 --- a/android/BUILD +++ b/android/BUILD @@ -32,6 +32,7 @@ iml_module( "//tools/idea/platform/tasks-platform-impl:intellij.platform.tasks.impl", "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", @@ -184,6 +185,7 @@ iml_module( "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", ], test_shard_count = 8, diff --git a/apkanalyzer/BUILD b/apkanalyzer/BUILD index e822c00c600..4fd24c29e85 100644 --- a/apkanalyzer/BUILD +++ b/apkanalyzer/BUILD @@ -18,6 +18,7 @@ iml_module( "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/idea/platform/configuration-store-impl:intellij.platform.configurationStore.impl", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", ], # do not sort: must match IML order diff --git a/assistant/BUILD b/assistant/BUILD index e13e896bf76..859c50d3548 100644 --- a/assistant/BUILD +++ b/assistant/BUILD @@ -12,6 +12,7 @@ iml_module( "//tools/idea/platform/tasks-platform-impl:intellij.platform.tasks.impl", "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", @@ -52,6 +53,7 @@ iml_module( "//tools/idea/platform/tasks-platform-impl:intellij.platform.tasks.impl", "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", diff --git a/build-common/BUILD b/build-common/BUILD index 7c65574e1a4..341264720af 100644 --- a/build-common/BUILD +++ b/build-common/BUILD @@ -43,6 +43,7 @@ iml_module( "//tools/idea/platform/configuration-store-impl:intellij.platform.configurationStore.impl", "//tools/idea/platform/built-in-server:intellij.platform.builtInServer.impl", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", ], # do not sort: must match IML order diff --git a/connection-assistant/BUILD b/connection-assistant/BUILD index 18c65c7d807..d065aff6e2e 100644 --- a/connection-assistant/BUILD +++ b/connection-assistant/BUILD @@ -20,6 +20,7 @@ iml_module( "//tools/idea/platform/tasks-platform-impl:intellij.platform.tasks.impl", "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", @@ -64,6 +65,7 @@ iml_module( "//tools/idea/platform/tasks-platform-impl:intellij.platform.tasks.impl", "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", diff --git a/deploy/BUILD b/deploy/BUILD index 32ec5900561..5bdf55e03fc 100644 --- a/deploy/BUILD +++ b/deploy/BUILD @@ -9,7 +9,7 @@ iml_module( visibility = ["//visibility:public"], # do not sort: must match IML order deps = [ - "//tools/idea/platform/annotations:intellij.platform.annotations.java5[module]", + "//tools/idea/.idea/libraries:jetbrains-annotations-java5", "//tools/idea/.idea/libraries:JUnit4[test]", "//tools/base/ddmlib:studio.android.sdktools.ddmlib[module]", "//tools/base/deploy/deployer:studio.android.sdktools.deployer[module]", diff --git a/designer/BUILD b/designer/BUILD index c15e0535ef4..312d3d7ade3 100644 --- a/designer/BUILD +++ b/designer/BUILD @@ -14,6 +14,7 @@ iml_module( "//tools/idea/platform/tasks-platform-impl:intellij.platform.tasks.impl", "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", @@ -54,7 +55,6 @@ iml_module( "//tools/adt/idea/designer:lib/org.eclipse.elk.graph-0.3.0", "//tools/adt/idea/designer:lib/org.eclipse.emf.common-2.12.0", "//tools/adt/idea/designer:lib/org.eclipse.emf.ecore-2.12.0", - "//tools/idea/platform/annotations/common:intellij.platform.annotations.common[module]", ], ) @@ -94,6 +94,7 @@ iml_module( "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", ], test_shard_count = 8, diff --git a/jps-plugin/BUILD b/jps-plugin/BUILD index 48f5b1cb443..e554feb558b 100644 --- a/jps-plugin/BUILD +++ b/jps-plugin/BUILD @@ -23,6 +23,7 @@ iml_module( "//tools/idea/platform/configuration-store-impl:intellij.platform.configurationStore.impl", "//tools/idea/platform/built-in-server:intellij.platform.builtInServer.impl", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", ], # do not sort: must match IML order diff --git a/kotlin-integration/BUILD b/kotlin-integration/BUILD index 587f78f641c..fff7d9c9c2b 100644 --- a/kotlin-integration/BUILD +++ b/kotlin-integration/BUILD @@ -48,6 +48,7 @@ iml_module( "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/idea/platform/configuration-store-impl:intellij.platform.configurationStore.impl", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", ], # do not sort: must match IML order diff --git a/layoutlib/BUILD b/layoutlib/BUILD index df09c04864e..e91e7ff2cb7 100644 --- a/layoutlib/BUILD +++ b/layoutlib/BUILD @@ -34,13 +34,14 @@ iml_module( "//tools/idea/platform/configuration-store-impl:intellij.platform.configurationStore.impl", "//tools/idea/platform/built-in-server:intellij.platform.builtInServer.impl", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", ], # do not sort: must match IML order deps = [ "//tools/idea/.idea/libraries:layoutlib", "//tools/base/sdk-common:studio.android.sdktools.sdk-common[module]", - "//tools/idea/platform/annotations:intellij.platform.annotations.java5[module]", + "//tools/idea/.idea/libraries:jetbrains-annotations-java5", "//tools/adt/idea/android-common:intellij.android.common[module]", "//tools/idea/platform/platform-api:intellij.platform.ide[module]", "//tools/base/layoutlib-api:studio.android.sdktools.layoutlib-api[module]", diff --git a/native-symbolizer/BUILD b/native-symbolizer/BUILD index b7bbd419c5a..e6717e234f1 100644 --- a/native-symbolizer/BUILD +++ b/native-symbolizer/BUILD @@ -20,6 +20,7 @@ iml_module( "//tools/idea/platform/tasks-platform-impl:intellij.platform.tasks.impl", "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", diff --git a/observable-demo/BUILD b/observable-demo/BUILD index 2fe5cb9b93e..8ffaf7ae4a6 100644 --- a/observable-demo/BUILD +++ b/observable-demo/BUILD @@ -27,6 +27,7 @@ iml_module( "//tools/idea/platform/configuration-store-impl:intellij.platform.configurationStore.impl", "//tools/idea/platform/built-in-server:intellij.platform.builtInServer.impl", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", ], # do not sort: must match IML order diff --git a/observable-ui/BUILD b/observable-ui/BUILD index b6eddf21242..290f5edb9b6 100644 --- a/observable-ui/BUILD +++ b/observable-ui/BUILD @@ -28,6 +28,7 @@ iml_module( "//tools/idea/platform/configuration-store-impl:intellij.platform.configurationStore.impl", "//tools/idea/platform/built-in-server:intellij.platform.builtInServer.impl", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", ], # do not sort: must match IML order diff --git a/observable/BUILD b/observable/BUILD index bc6ac6b701c..526f92ed14c 100644 --- a/observable/BUILD +++ b/observable/BUILD @@ -26,7 +26,7 @@ iml_module( # do not sort: must match IML order deps = [ "//tools/idea/.idea/libraries:Guava", - "//tools/idea/platform/annotations:intellij.platform.annotations.java5[module]", + "//tools/idea/.idea/libraries:jetbrains-annotations-java5", "//tools/idea/.idea/libraries:truth[test]", "//tools/idea/.idea/libraries:JUnit4[test]", "//tools/idea/platform/testFramework:intellij.platform.testFramework[module, test]", diff --git a/perfd-host/BUILD b/perfd-host/BUILD index 8c9f7bae5c6..ec591f30d8a 100644 --- a/perfd-host/BUILD +++ b/perfd-host/BUILD @@ -14,6 +14,7 @@ iml_module( "//tools/idea/platform/tasks-platform-impl:intellij.platform.tasks.impl", "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", @@ -33,7 +34,7 @@ iml_module( "//tools/idea/.idea/libraries:sqlite", "//tools/analytics-library/tracker:analytics-tracker[module]", "//tools/adt/idea/native-symbolizer[module]", - "//tools/idea/platform/annotations:intellij.platform.annotations.java5[module]", + "//tools/idea/.idea/libraries:jetbrains-annotations-java5", "//tools/idea/.idea/libraries:KotlinJavaRuntime[test]", "//tools/idea/.idea/libraries:protobuf", "//tools/idea/.idea/libraries:studio-analytics-proto", diff --git a/profilers-android/BUILD b/profilers-android/BUILD index 6f1bd956ae0..708db5b94d9 100644 --- a/profilers-android/BUILD +++ b/profilers-android/BUILD @@ -14,6 +14,7 @@ iml_module( "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/vendor/intellij/cidr:intellij.c.doxygen", diff --git a/profilers-ui/BUILD b/profilers-ui/BUILD index 228d35a24d7..946e8d4280f 100644 --- a/profilers-ui/BUILD +++ b/profilers-ui/BUILD @@ -29,12 +29,13 @@ iml_module( "//tools/idea/platform/configuration-store-impl:intellij.platform.configurationStore.impl", "//tools/idea/platform/built-in-server:intellij.platform.builtInServer.impl", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", ], # do not sort: must match IML order deps = [ "//tools/adt/idea/profilers:intellij.android.profilers[module]", - "//tools/idea/platform/annotations:intellij.platform.annotations.java5[module]", + "//tools/idea/.idea/libraries:jetbrains-annotations-java5", "//tools/idea/.idea/libraries:studio-profiler-grpc-1.0-jarjar", "//tools/idea/platform/core-api:intellij.platform.core[module]", "//tools/idea/.idea/libraries:Guava", diff --git a/profilers/BUILD b/profilers/BUILD index 73fead4c640..6b94eb8fec8 100644 --- a/profilers/BUILD +++ b/profilers/BUILD @@ -10,7 +10,7 @@ iml_module( visibility = ["//visibility:public"], # do not sort: must match IML order deps = [ - "//tools/idea/platform/annotations:intellij.platform.annotations.java5[module]", + "//tools/idea/.idea/libraries:jetbrains-annotations-java5", "//tools/idea/.idea/libraries:studio-profiler-grpc-1.0-jarjar", "//tools/idea/.idea/libraries:Guava", "//tools/adt/idea/adt-ui-model:intellij.android.adt.ui.model[module]", @@ -23,7 +23,6 @@ iml_module( "//tools/base/common:studio.android.sdktools.common[module]", "//tools/idea/.idea/libraries:KotlinJavaRuntime[test]", "//tools/adt/idea/profilers-atrace[module]", - # b/111212820 eliminate this dependency when the needed classes are refactored out. "//tools/base/ddmlib:studio.android.sdktools.ddmlib[module]", ], ) diff --git a/project-system-gradle/BUILD b/project-system-gradle/BUILD index f76fd60033d..08c1b8594dc 100644 --- a/project-system-gradle/BUILD +++ b/project-system-gradle/BUILD @@ -13,6 +13,7 @@ iml_module( "//tools/idea/platform/tasks-platform-impl:intellij.platform.tasks.impl", "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", @@ -64,6 +65,7 @@ iml_module( "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", ], diff --git a/project-system/BUILD b/project-system/BUILD index 8fda37a5578..d1eb9bd9339 100644 --- a/project-system/BUILD +++ b/project-system/BUILD @@ -33,7 +33,6 @@ iml_module( "//tools/idea/.idea/libraries:Guava", "//tools/idea/platform/platform-impl:intellij.platform.ide.impl[module]", "//tools/base/common:studio.android.sdktools.common[module]", - "//tools/idea/platform/annotations/common:intellij.platform.annotations.common[module]", "//tools/base/sdk-common:studio.android.sdktools.sdk-common[module]", "//tools/idea/java/java-psi-api:intellij.java.psi[module]", ], @@ -50,6 +49,7 @@ iml_module( "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", ], @@ -8,7 +8,7 @@ iml_module( visibility = ["//visibility:public"], # do not sort: must match IML order deps = [ - "//tools/idea/platform/annotations:intellij.platform.annotations.java5[module]", + "//tools/idea/.idea/libraries:jetbrains-annotations-java5", "//tools/idea/platform/util-rt:intellij.platform.util.rt[module]", ], ) diff --git a/sdk-updates/BUILD b/sdk-updates/BUILD index 977547150b4..76382b37b2b 100644 --- a/sdk-updates/BUILD +++ b/sdk-updates/BUILD @@ -12,6 +12,7 @@ iml_module( "//tools/idea/platform/tasks-platform-impl:intellij.platform.tasks.impl", "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", @@ -49,6 +50,7 @@ iml_module( "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", ], diff --git a/smali/BUILD b/smali/BUILD index a384cd4bf23..4a61ab99540 100644 --- a/smali/BUILD +++ b/smali/BUILD @@ -15,6 +15,7 @@ iml_module( test_runtime_deps = [ "//tools/idea/platform/external-system-impl:intellij.platform.externalSystem.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", ], test_srcs = ["testSrc"], visibility = ["//visibility:public"], diff --git a/uitest-framework-bazel/BUILD b/uitest-framework-bazel/BUILD index 5eb8eea6dc0..0a2f9e0bda6 100644 --- a/uitest-framework-bazel/BUILD +++ b/uitest-framework-bazel/BUILD @@ -11,6 +11,7 @@ iml_module( "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", "//tools/vendor/intellij/cidr:intellij.c.doxygen", diff --git a/uitest-framework-gradle/BUILD b/uitest-framework-gradle/BUILD index 6cb78472651..ad78cf18a61 100644 --- a/uitest-framework-gradle/BUILD +++ b/uitest-framework-gradle/BUILD @@ -11,6 +11,7 @@ iml_module( "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", "//tools/vendor/intellij/cidr:intellij.c.doxygen", diff --git a/uitest-framework/BUILD b/uitest-framework/BUILD index 1c01d13a714..69f057f4c11 100644 --- a/uitest-framework/BUILD +++ b/uitest-framework/BUILD @@ -14,6 +14,7 @@ iml_module( "//tools/idea/platform/tasks-platform-impl:intellij.platform.tasks.impl", "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", diff --git a/updater-ui/BUILD b/updater-ui/BUILD index 00ba4d449af..b551dbaa5f7 100644 --- a/updater-ui/BUILD +++ b/updater-ui/BUILD @@ -12,6 +12,7 @@ iml_module( "//tools/idea/platform/tasks-platform-impl:intellij.platform.tasks.impl", "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", diff --git a/whats-new-assistant/BUILD b/whats-new-assistant/BUILD index 8ba0a67a3c6..f5e641562ff 100644 --- a/whats-new-assistant/BUILD +++ b/whats-new-assistant/BUILD @@ -13,6 +13,7 @@ iml_module( "//tools/idea/platform/tasks-platform-impl:intellij.platform.tasks.impl", "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", @@ -51,6 +52,7 @@ iml_module( "//tools/idea/platform/tasks-platform-impl:intellij.platform.tasks.impl", "//tools/idea/json:intellij.json", "//tools/idea/platform/credential-store:intellij.platform.credentialStore", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", "//tools/idea/plugins/IntelliLang/intellilang-jps-plugin:intellij.java.langInjection.jps", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", diff --git a/wizard/BUILD b/wizard/BUILD index 983e94d9939..2fe47d479c2 100644 --- a/wizard/BUILD +++ b/wizard/BUILD @@ -28,6 +28,7 @@ iml_module( "//tools/idea/platform/configuration-store-impl:intellij.platform.configurationStore.impl", "//tools/idea/platform/built-in-server:intellij.platform.builtInServer.impl", "//tools/adt/idea/adt-branding:intellij.android.adt.branding", + "//tools/idea/jvm/jvm-analysis-impl:intellij.jvm.analysis.impl", "//tools/idea/java/compiler/instrumentation-util-8:intellij.java.compiler.instrumentationUtil.java8", ], # do not sort: must match IML order |