From 710a41358af7b0638570a644f08b80a2725fbe94 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 8 Sep 2017 13:29:54 -0700 Subject: [PATCH] Upgrade to ManifestMerger2 Switch to using ManifestMerger2 from prebuilts/gradle-plugin/com/android/tools/build/manifest-merger/26.0.0-beta2/manifest-merger-26.0.0-beta2.jar Bug: 36005379 Test: m -j checkbuild Change-Id: I83bd3f95778e93796d06f063aa7c61d2a63b117b Merged-In: I83bd3f95778e93796d06f063aa7c61d2a63b117b (cherry picked from commit e76e8021ebaca486aee8e82d6a3ce25a10bc3974) --- core/android_manifest.mk | 4 +++- core/config.mk | 9 ++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/core/android_manifest.mk b/core/android_manifest.mk index 0093e02087..7d573d3fc3 100644 --- a/core/android_manifest.mk +++ b/core/android_manifest.mk @@ -34,10 +34,12 @@ ifdef my_full_libs_manifest_files main_android_manifest := $(full_android_manifest) full_android_manifest := $(intermediates.COMMON)/AndroidManifest.xml $(full_android_manifest): PRIVATE_LIBS_MANIFESTS := $(my_full_libs_manifest_files) +$(full_android_manifest): $(ANDROID_MANIFEST_MERGER_CLASSPATH) $(full_android_manifest) : $(main_android_manifest) $(my_full_libs_manifest_deps) @echo "Merge android manifest files: $@ <-- $< $(PRIVATE_LIBS_MANIFESTS)" @mkdir -p $(dir $@) - $(hide) $(ANDROID_MANIFEST_MERGER) --main $< --libs $(PRIVATE_LIBS_MANIFESTS) \ + $(hide) $(ANDROID_MANIFEST_MERGER) --main $< \ + --libs $(call normalize-path-list,$(PRIVATE_LIBS_MANIFESTS)) \ --out $@ endif diff --git a/core/config.mk b/core/config.mk index 868c356857..1ab263a72d 100644 --- a/core/config.mk +++ b/core/config.mk @@ -675,7 +675,14 @@ FINDBUGS := $(FINDBUGS_DIR)/findbugs JACOCO_CLI_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jacoco-cli$(COMMON_JAVA_PACKAGE_SUFFIX) # Tool to merge AndroidManifest.xmls -ANDROID_MANIFEST_MERGER := $(JAVA) -classpath prebuilts/devtools/tools/lib/manifest-merger.jar com.android.manifmerger.Main merge +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/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