summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2023-01-31 00:08:14 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-01-31 00:08:14 +0000
commit8394173c71f5fd323d903a9ee5a18928c3c5f330 (patch)
treeb81741f28419c1954c2ab0039984bc7fcf888325
parent1f37ef0515277f8a4b01db69a3def99f27c121c4 (diff)
parentcf779f544bd21409ab6f87beb778cc6d9a08ef21 (diff)
downloadkotlinc-8394173c71f5fd323d903a9ee5a18928c3c5f330.tar.gz
Merge "add jdk7 dependency to kotlin-stdlib-jdk8" am: 7b983a90c2 am: 84d6095c90 am: cf779f544b
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/2378828 Change-Id: Ie57b1280881a845084fef6fcd94fed62ad837a4c 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: [