commit 7c56085890b126d43b78b32b4e03a0d4539a74b8
author Søren Gjesse <sgjesse@google.com> Wed Jun 20 16:27:21 2018 +0200
committer Jinseong Jeon <jsjeon@google.com> Wed Jun 20 17:04:36 2018 +0000
tree bc6f69bff12dc1169776fa760eff06a08e1c9592
parent 099918de51cc9e1ccd73e334d3a18629942084f6

Relocate the R8 Kotlin dependencies

The Kotlin metadata library lives in the package kotlinx, and also include
classes in the package org.jetbrains. The code depends on the Kotlin
Standard Library which lives in the kotlin package.

Bug: 78896810, 110462870
Change-Id: I46a869949c56b4359690d53b63c31cb0be45bf5d

build.gradle

diff --git a/build.gradle b/build.gradle
index 7f41caa..7761e37 100644
--- a/build.gradle
+++ b/build.gradle
@@ -501,6 +501,9 @@
     task.relocate('org.apache.commons', 'com.android.tools.r8.org.apache.commons')
     task.relocate('org.objectweb.asm', 'com.android.tools.r8.org.objectweb.asm')
     task.relocate('it.unimi.dsi.fastutil', 'com.android.tools.r8.it.unimi.dsi.fastutil')
+    task.relocate('kotlin', 'com.android.tools.r8.jetbrains.kotlin')
+    task.relocate('kotlinx', 'com.android.tools.r8.jetbrains.kotlinx')
+    task.relocate('org.jetbrains', 'com.android.tools.r8.org.jetbrains')
 }
 
 task repackageDeps(type: ShadowJar) {