commit | 44d29bc477d25040bdac016fdec8ef5779e1e98f | [log] [tgz] |
---|---|---|
author | Aurimas Liutikas <aurimas@google.com> | Thu Aug 27 18:21:56 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 27 18:21:56 2020 +0000 |
tree | f1a52aa5b18ad81567c52490b2ed3023f01bf1cf | |
parent | f9a26f1b1347f934aa92042a60cf01fc2be8bac5 [diff] | |
parent | e4ddf1a35b0a233762722f3a9cb5a806878ba9e7 [diff] |
Add workaround for Kotlin 1.4 upgrade am: 314fb889a1 am: 237e5097e4 am: 5e64099a60 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1411868 Change-Id: Ia927669598d23905f0a23f271fc4f42c8bb0a0a4
diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp index f4799f0..1143e05 100644 --- a/staticlibs/Android.bp +++ b/staticlibs/Android.bp
@@ -102,6 +102,9 @@ "net-tests-utils-host-device-common", "net-utils-device-common", ], + kotlincflags: [ + "-XXLanguage:-GenerateJvmOverloadsAsFinal" + ] } filegroup {