diff --git a/core/config.mk b/core/config.mk index 2fb25074ee..4361e073d7 100644 --- a/core/config.mk +++ b/core/config.mk @@ -720,9 +720,11 @@ JETIFIER := prebuilts/sdk/tools/jetifier/jetifier-standalone/bin/jetifier-standa # Tool to merge AndroidManifest.xmls ANDROID_MANIFEST_MERGER_CLASSPATH := \ - prebuilts/gradle-plugin/com/android/tools/build/manifest-merger/26.0.0-beta2/manifest-merger-26.0.0-beta2.jar \ - prebuilts/gradle-plugin/com/android/tools/sdk-common/26.0.0-beta2/sdk-common-26.0.0-beta2.jar \ - prebuilts/gradle-plugin/com/android/tools/common/26.0.0-beta2/common-26.0.0-beta2.jar \ + prebuilts/gradle-plugin/com/android/tools/build/manifest-merger/26.1.0/manifest-merger-26.1.0.jar \ + prebuilts/gradle-plugin/com/android/tools/sdk-common/26.1.0/sdk-common-26.1.0.jar \ + prebuilts/gradle-plugin/com/android/tools/common/26.1.0/common-26.1.0.jar \ + prebuilts/gradle-plugin/org/jetbrains/kotlin/kotlin-runtime/1.0.5/kotlin-runtime-1.0.5.jar \ + prebuilts/gradle-plugin/org/jetbrains/kotlin/kotlin-stdlib/1.1.3/kotlin-stdlib-1.1.3.jar \ prebuilts/misc/common/guava/guava-21.0.jar ANDROID_MANIFEST_MERGER := $(JAVA) \ -classpath $(subst $(space),:,$(strip $(ANDROID_MANIFEST_MERGER_CLASSPATH))) \