summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2023-01-30 21:58:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-01-30 21:58:39 +0000
commit84d6095c9007cda1de5ada65ff119fb17bd7c03b (patch)
treeb81741f28419c1954c2ab0039984bc7fcf888325
parentac7aca4216d57424fbc192f0b31fe144439a8cc9 (diff)
parent7b983a90c2b67bae02ebf6e5acb130e97924e476 (diff)
downloadkotlinc-84d6095c9007cda1de5ada65ff119fb17bd7c03b.tar.gz
Merge "add jdk7 dependency to kotlin-stdlib-jdk8" am: 7b983a90c2
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/2378828 Change-Id: I56a2f3cd73a7652fcac4da3e33b213688865f5d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp5
1 files changed, 4 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 7df9e84..7d3e45a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,7 +57,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: [