Update BUILD rules after Change I3ac35ada

Change-Id: I300f791b51e2bc1553091f7479852e079962e8e2

22 files changed, 29 insertions, 29 deletions

diff --git a/adt-ui-model/BUILD b/adt-ui-model/BUILD
index 26692039ec4..4829f48706c 100644
--- a/adt-ui-model/BUILD
+++ b/adt-ui-model/BUILD
@@ -15,6 +15,6 @@ iml_module(
         "//tools/idea/.idea/libraries:Guava",
         "//tools/idea/.idea/libraries:JUnit4[test]",
         "//tools/idea/.idea/libraries:truth[test]",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
     ],
 )
diff --git a/adt-ui/BUILD b/adt-ui/BUILD
index 74ecddc211c..d0441465baf 100644
--- a/adt-ui/BUILD
+++ b/adt-ui/BUILD
@@ -52,7 +52,7 @@ iml_module(
         "//tools/adt/idea/adt-ui/lib:libwebp",
         "//tools/adt/idea/adt-testutils:intellij.android.adt.testutils[module, test]",
         "//tools/adt/idea/artwork:intellij.android.artwork[module]",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/idea/.idea/libraries:Java_Compatibility",
     ],
 )
diff --git a/android-adb/BUILD b/android-adb/BUILD
index bbf7ffdcdc5..dc3e794bdbc 100644
--- a/android-adb/BUILD
+++ b/android-adb/BUILD
@@ -13,7 +13,7 @@ iml_module(
         "//tools/idea/.idea/libraries:jsr305",
         "//tools/idea/platform/platform-api:intellij.platform.ide[module]",
         "//tools/idea/platform/xdebugger-api:intellij.platform.debugger[module]",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/idea/.idea/libraries:Guava",
     ],
 )
diff --git a/android-common/BUILD b/android-common/BUILD
index b64eddd6005..43962a8ace7 100644
--- a/android-common/BUILD
+++ b/android-common/BUILD
@@ -55,6 +55,6 @@ iml_module(
         "//tools/idea/platform/projectModel-api:intellij.platform.projectModel[module]",
         "//tools/idea/.idea/libraries:mockito[test]",
         "//tools/adt/idea/adt-testutils:intellij.android.adt.testutils[module, test]",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
     ],
 )
diff --git a/android-debuggers/BUILD b/android-debuggers/BUILD
index e71335a5b4a..692bb4b7c3d 100644
--- a/android-debuggers/BUILD
+++ b/android-debuggers/BUILD
@@ -33,7 +33,7 @@ iml_module(
     # do not sort: must match IML order
     deps = [
         "//tools/idea/platform/platform-api:intellij.platform.ide[module]",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/base/flags:studio.android.sdktools.flags[module]",
         "//tools/adt/idea/android-common:intellij.android.common[module]",
         "//tools/adt/idea/android-adb:intellij.android.adb[module]",
diff --git a/android-kotlin/BUILD b/android-kotlin/BUILD
index 62d52bf2918..a2cf5fdebe3 100644
--- a/android-kotlin/BUILD
+++ b/android-kotlin/BUILD
@@ -20,7 +20,7 @@ iml_module(
     ],
     # do not sort: must match IML order
     deps = [
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/adt/idea/android:intellij.android.core[module]",
         "//tools/idea/.idea/libraries:kotlin-plugin",
     ],
@@ -57,7 +57,7 @@ iml_module(
         "//tools/idea:intellij.java.impl[module]",
         "//tools/idea/xml/dom-openapi:intellij.xml.dom[module]",
         "//tools/idea/xml/xml-psi-api:intellij.xml.psi[module]",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/idea/.idea/libraries:Gradle",
         "//tools/idea/xml/xml-psi-impl:intellij.xml.psi.impl[module]",
         "//tools/idea/.idea/libraries:kotlin-plugin",
@@ -107,7 +107,7 @@ iml_module(
         "//tools/adt/idea/android-kotlin:intellij.android.kotlin.idea[module]",
         "//tools/analytics-library/crash:analytics-crash[module]",
         "//tools/idea/.idea/libraries:Gradle",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/idea/.idea/libraries:kotlin-plugin",
     ],
 )
@@ -150,7 +150,7 @@ iml_module(
         "//tools/idea:intellij.platform.jps.build_and_others[module]",
         "//tools/idea/jps/model-api:intellij.platform.jps.model[module]",
         "//tools/idea/jps/model-serialization:intellij.platform.jps.model.serialization[module]",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/idea/.idea/libraries:kotlin-plugin",
     ],
 )
diff --git a/android-lang-databinding/BUILD b/android-lang-databinding/BUILD
index c6cd00f5db9..a7d976d40c1 100644
--- a/android-lang-databinding/BUILD
+++ b/android-lang-databinding/BUILD
@@ -24,7 +24,7 @@ iml_module(
     ],
     # do not sort: must match IML order
     deps = [
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/idea/platform/lang-api:intellij.platform.lang[module]",
         "//tools/adt/idea/android:intellij.android.core[module]",
         "//tools/data-binding:studio.compiler[module]",
@@ -77,7 +77,7 @@ iml_module(
     ],
     # do not sort: must match IML order
     deps = [
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/adt/idea/android-lang-databinding:intellij.android.lang-databinding[module]",
         "//tools/adt/idea/databinding:intellij.android.databinding[module]",
         "//tools/idea/platform/testFramework:intellij.platform.testFramework[module, test]",
diff --git a/android-lang/BUILD b/android-lang/BUILD
index cfb7af08c49..9ea5f57d306 100644
--- a/android-lang/BUILD
+++ b/android-lang/BUILD
@@ -30,7 +30,7 @@ iml_module(
         "//tools/adt/idea/artwork:intellij.android.artwork[module]",
         "//tools/idea:intellij.java.analysis.impl[module]",
         "//tools/idea/platform/lang-impl:intellij.platform.lang.impl[module]",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/idea/.idea/libraries:Guava",
         "//tools/idea/uast/uast-common:intellij.platform.uast[module]",
         "//tools/idea/platform/util:intellij.platform.util[module]",
diff --git a/android-layout-inspector/BUILD b/android-layout-inspector/BUILD
index 8118025f481..7a0d0391960 100644
--- a/android-layout-inspector/BUILD
+++ b/android-layout-inspector/BUILD
@@ -28,7 +28,7 @@ iml_module(
         "//tools/idea/platform/platform-api:intellij.platform.ide[module]",
         "//tools/adt/idea/artwork:intellij.android.artwork[module]",
         "//tools/base/layoutinspector:studio.android.sdktools.layoutinspector[module]",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/idea/platform/platform-impl:intellij.platform.ide.impl[module]",
         "//tools/idea/images:intellij.platform.images[module]",
         "//tools/adt/idea/android-common:intellij.android.common[module]",
@@ -81,7 +81,7 @@ iml_module(
         "//tools/idea/platform/platform-api:intellij.platform.ide[module]",
         "//tools/adt/idea/artwork:intellij.android.artwork[module]",
         "//tools/base/layoutinspector:studio.android.sdktools.layoutinspector[module]",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/idea/.idea/libraries:kotlin-test[test]",
         "//tools/idea/platform/platform-impl:intellij.platform.ide.impl[module]",
         "//tools/idea/images:intellij.platform.images[module]",
diff --git a/connection-assistant/BUILD b/connection-assistant/BUILD
index 6b86d0f434a..e6d411b8592 100644
--- a/connection-assistant/BUILD
+++ b/connection-assistant/BUILD
@@ -33,7 +33,7 @@ iml_module(
         "//tools/adt/idea/android-common:intellij.android.common[module]",
         "//tools/idea/platform/editor-ui-api:intellij.platform.editor[module]",
         "//tools/analytics-library/tracker:analytics-tracker[module]",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/base/usb-devices:studio.usb-devices[module]",
         "//tools/base/common:studio.android.sdktools.common[module]",
         "//tools/base/ddmlib:studio.android.sdktools.ddmlib[module]",
@@ -80,7 +80,7 @@ iml_module(
         "//tools/adt/idea/android-common:intellij.android.common[module]",
         "//tools/idea/platform/editor-ui-api:intellij.platform.editor[module]",
         "//tools/analytics-library/tracker:analytics-tracker[module]",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/base/usb-devices:studio.usb-devices[module]",
         "//tools/base/common:studio.android.sdktools.common[module]",
         "//tools/base/ddmlib:studio.android.sdktools.ddmlib[module]",
diff --git a/kotlin-integration/BUILD b/kotlin-integration/BUILD
index e0580c66129..23b192fdca3 100644
--- a/kotlin-integration/BUILD
+++ b/kotlin-integration/BUILD
@@ -43,7 +43,7 @@ iml_module(
     # do not sort: must match IML order
     runtime_deps = [
         "//tools/adt/idea/adt-branding:intellij.android.adt.branding",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/idea/platform/lvcs-impl:intellij.platform.lvcs.impl",
         "//tools/idea/xml/relaxng:intellij.relaxng",
         "//tools/idea/platform/tasks-platform-impl:intellij.platform.tasks.impl",
diff --git a/layout-inspector/BUILD b/layout-inspector/BUILD
index e78526e4991..c94408c4e0e 100644
--- a/layout-inspector/BUILD
+++ b/layout-inspector/BUILD
@@ -22,7 +22,7 @@ iml_module(
     ],
     # do not sort: must match IML order
     deps = [
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/idea/platform/platform-api:intellij.platform.ide[module]",
         "//tools/adt/idea/android-common:intellij.android.common[module]",
         "//tools/base/flags:studio.android.sdktools.flags[module]",
diff --git a/layoutlib/BUILD b/layoutlib/BUILD
index 3f030181063..15371db99b9 100644
--- a/layoutlib/BUILD
+++ b/layoutlib/BUILD
@@ -96,6 +96,6 @@ iml_module(
         "//tools/idea/.idea/libraries:Guava[test]",
         "//tools/idea/.idea/libraries:ASM[test]",
         "//tools/adt/idea/layoutlib:intellij.android.layoutlib[module, test]",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime[test]",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8[test]",
     ],
 )
diff --git a/native-symbolizer/BUILD b/native-symbolizer/BUILD
index bbdf900212c..c936e5df6c5 100644
--- a/native-symbolizer/BUILD
+++ b/native-symbolizer/BUILD
@@ -29,7 +29,7 @@ iml_module(
     ],
     # do not sort: must match IML order
     deps = [
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/idea/platform/core-api:intellij.platform.core[module]",
         "//tools/adt/idea/android:intellij.android.core[module]",
         "//tools/adt/idea/android-common:intellij.android.common[module]",
diff --git a/perfd-host/BUILD b/perfd-host/BUILD
index 523de9c42e4..cf8bdde5bf8 100644
--- a/perfd-host/BUILD
+++ b/perfd-host/BUILD
@@ -36,7 +36,7 @@ iml_module(
         "//tools/analytics-library/tracker:analytics-tracker[module]",
         "//tools/adt/idea/native-symbolizer[module]",
         "//tools/idea/.idea/libraries:jetbrains-annotations-java5",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime[test]",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8[test]",
         "//tools/idea/.idea/libraries:protobuf",
         "//tools/idea/.idea/libraries:studio-analytics-proto",
     ],
diff --git a/profilers-atrace/BUILD b/profilers-atrace/BUILD
index 0b77ed063e2..2f4a1c5cd19 100644
--- a/profilers-atrace/BUILD
+++ b/profilers-atrace/BUILD
@@ -12,7 +12,7 @@ iml_module(
     visibility = ["//visibility:public"],
     # do not sort: must match IML order
     deps = [
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/idea/.idea/libraries:kotlin-reflect",
     ],
 )
diff --git a/profilers-ui/BUILD b/profilers-ui/BUILD
index 4de589ce6b6..14691922353 100644
--- a/profilers-ui/BUILD
+++ b/profilers-ui/BUILD
@@ -45,7 +45,7 @@ iml_module(
         "//tools/idea/.idea/libraries:mockito[test]",
         "//tools/idea/.idea/libraries:truth[test]",
         "//tools/base/testutils:studio.android.sdktools.testutils[module, test]",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime[test]",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8[test]",
         "//tools/adt/idea/artwork:intellij.android.artwork[module]",
         "//tools/idea/platform/platform-impl:intellij.platform.ide.impl[module]",
         "//tools/idea/.idea/libraries:Java_Compatibility",
diff --git a/profilers/BUILD b/profilers/BUILD
index e0ac087339b..b4ed3f66bfe 100644
--- a/profilers/BUILD
+++ b/profilers/BUILD
@@ -37,7 +37,7 @@ iml_module(
         "//tools/idea/.idea/libraries:mockito[test]",
         "//tools/idea/.idea/libraries:truth[test]",
         "//tools/base/common:studio.android.sdktools.common[module]",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime[test]",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8[test]",
         "//tools/adt/idea/profilers-atrace:intellij.android.profilers.atrace[module]",
         "//tools/adt/idea/perfd-host:intellij.android.perfdHost[module, test]",
         "//tools/base/ddmlib:studio.android.sdktools.ddmlib[module]",
@@ -59,7 +59,7 @@ kotlin_test(
         "//tools/adt/idea/perfd-host:intellij.android.perfdHost",
         "//tools/base/perf-logger:studio.perf-logger",
         "//tools/base/testutils:tools.testutils",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/idea/.idea/libraries:studio-profiler-grpc-1.0-jarjar",
     ],
 )
diff --git a/project-system-gradle/BUILD b/project-system-gradle/BUILD
index 5f1b7a630ca..128fc8dd020 100644
--- a/project-system-gradle/BUILD
+++ b/project-system-gradle/BUILD
@@ -26,7 +26,7 @@ iml_module(
         "//tools/adt/idea/project-system:intellij.android.projectSystem[module]",
         "//tools/adt/idea/android:intellij.android.core[module]",
         "//tools/adt/idea/android-common:intellij.android.common[module]",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/base/apkparser/analyzer:studio.android.sdktools.analyzer[module]",
         "//tools/idea/platform/lang-api:intellij.platform.lang[module]",
         "//tools/base/sdk-common:studio.android.sdktools.sdk-common[module]",
diff --git a/resources-aar/BUILD b/resources-aar/BUILD
index a019ec56f9e..c73641e8022 100644
--- a/resources-aar/BUILD
+++ b/resources-aar/BUILD
@@ -15,7 +15,7 @@ iml_module(
         "//tools/idea/platform/util:intellij.platform.util[module]",
         "//tools/idea/platform/util-rt:intellij.platform.util.rt[module]",
         "//tools/idea/.idea/libraries:aapt-proto",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/idea/.idea/libraries:protobuf",
     ],
 )
diff --git a/uitest-framework/BUILD b/uitest-framework/BUILD
index c7cac1b5f49..4bc3e53edbb 100644
--- a/uitest-framework/BUILD
+++ b/uitest-framework/BUILD
@@ -47,7 +47,7 @@ iml_module(
         "//tools/adt/idea/android-common:intellij.android.common[module, test]",
         "//tools/base/perf-logger:studio.perf-logger[module, test]",
         "//tools/adt/idea/project-system:intellij.android.projectSystem[module, test]",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/adt/idea/android-layout-inspector[module, test]",
         "//tools/adt/idea/adt-testutils:intellij.android.adt.testutils[module, test]",
         "//tools/adt/idea/profilers-android:intellij.android.profilersAndroid[module, test]",
diff --git a/whats-new-assistant/BUILD b/whats-new-assistant/BUILD
index 6c7983cd07b..e0ee05f082f 100644
--- a/whats-new-assistant/BUILD
+++ b/whats-new-assistant/BUILD
@@ -69,7 +69,7 @@ iml_module(
         "//tools/adt/idea/android-common:intellij.android.common[module]",
         "//tools/idea/platform/platform-impl:intellij.platform.ide.impl[module]",
         "//tools/base/flags:studio.android.sdktools.flags[module]",
-        "//tools/idea/.idea/libraries:KotlinJavaRuntime",
+        "//tools/idea/.idea/libraries:kotlin-stdlib-jdk8",
         "//tools/idea/.idea/libraries:mockito[test]",
         "//tools/idea/.idea/libraries:truth[test]",
         "//tools/idea/platform/testFramework:intellij.platform.testFramework[module, test]",