diff --git a/core/android_manifest.mk b/core/android_manifest.mk index 3af81ffba1..517379a12e 100644 --- a/core/android_manifest.mk +++ b/core/android_manifest.mk @@ -47,7 +47,7 @@ $(full_android_manifest): $(MANIFEST_FIXER) ifneq (,$(strip $(my_full_libs_manifest_files))) $(full_android_manifest): PRIVATE_LIBS_MANIFESTS := $(my_full_libs_manifest_files) -$(full_android_manifest): $(ANDROID_MANIFEST_MERGER_CLASSPATH) +$(full_android_manifest): $(ANDROID_MANIFEST_MERGER_DEPS) $(full_android_manifest) : $(main_android_manifest) $(my_full_libs_manifest_files) @echo "Merge android manifest files: $@ <-- $< $(PRIVATE_LIBS_MANIFESTS)" @mkdir -p $(dir $@) diff --git a/core/config.mk b/core/config.mk index 32927f5785..0ef5e334df 100644 --- a/core/config.mk +++ b/core/config.mk @@ -731,19 +731,6 @@ FINDBUGS := $(FINDBUGS_DIR)/findbugs JETIFIER := prebuilts/sdk/tools/jetifier/jetifier-standalone/bin/jetifier-standalone -# 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/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 -ANDROID_MANIFEST_MERGER := $(JAVA) \ - -classpath $(subst $(space),:,$(strip $(ANDROID_MANIFEST_MERGER_CLASSPATH))) \ - com.android.manifmerger.Merger - COLUMN:= column USE_OPENJDK9 := true