summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2023-01-30 23:18:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-01-30 23:18:00 +0000
commitcf779f544bd21409ab6f87beb778cc6d9a08ef21 (patch)
treeb81741f28419c1954c2ab0039984bc7fcf888325
parent9ddb7bfa5e9e930397fe9ee64285ef8baa623517 (diff)
parent84d6095c9007cda1de5ada65ff119fb17bd7c03b (diff)
downloadkotlinc-cf779f544bd21409ab6f87beb778cc6d9a08ef21.tar.gz
Merge "add jdk7 dependency to kotlin-stdlib-jdk8" am: 7b983a90c2 am: 84d6095c90
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/2378828 Change-Id: I01881c28e5b071fc13ac04bf7aa96b57ca6be414 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: [