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

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

Merge "Fix missing class in manifest merger" 

am: 7f706cab

Change-Id: I6795b7f85323dfa5874f7dc677c143ddc096ffcc
parents 725e94ea 7f706cab

core/config.mk

+2 −1
Original line number Diff line number Diff line
@@ -713,8 +713,9 @@ FINDBUGS := $(FINDBUGS_DIR)/findbugs 
# 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