add jdk7 dependency to kotlin-stdlib-jdk8

JDK8PlatformImplementations in kotlin-stdlib-jdk8.jar extends
JDK7PlatformImplementations that is defined in kotlin-stdlib-jdk7.
During optimization, r8 complains that JDK8PlatformImplementations is
extending a missing class, so we should instead always package the JDK7
class in with the JDK8 module.

Bug: 242088131
Change-Id: I895704e4df71db24fc813571fb5700c2707f37af

1 files changed, 4 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index b3ffdc7..d185880 100644
--- a/Android.bp
+++ b/Android.bp
@@ -58,7 +58,10 @@ java_import {
 java_import {
     name: "kotlin-stdlib-jdk8",
     host_supported: true,
-    jars: ["lib/kotlin-stdlib-jdk8.jar"],
+    jars: [
+        "lib/kotlin-stdlib-jdk8.jar",
+        "lib/kotlin-stdlib-jdk7.jar",
+    ],
     sdk_version: "core_current",
     exclude_dirs: ["META-INF/versions"],
     apex_available: [