Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f8c7c33 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Fix missing class in manifest merger" am: 7f706cab am: df267c25 

am: c45949b4

Change-Id: If7ef9c64ef5e134f49b54f971e64fd4e02b80b26
parents b3c5caad c45949b4

core/config.mk

+2 −1
Original line number Diff line number Diff line
@@ -721,8 +721,9 @@ 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.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/com/android/tools/sdk-common/26.1.0/sdk-common-26.1.0.jar \

    prebuilts/gradle-plugin/com/android/tools/sdklib/26.1.0/sdklib-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