From 7293c1e4b9675c9a3fa804dc34436ef628567b6d Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 26 Feb 2019 22:12:30 -0800 Subject: [PATCH] Update manifest merger to use binary Manifest merger is now a java_binary instead of a collection of jars, it can use the single binary as the dependency. Bug: 112607039 Test: m checkbuild Change-Id: Id97b01542314cb165ebf7c90409a09482d8c53bc --- core/android_manifest.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/android_manifest.mk b/core/android_manifest.mk index efa6ae61d..931b1b187 100644 --- a/core/android_manifest.mk +++ b/core/android_manifest.mk @@ -36,7 +36,7 @@ ifneq (,$(strip $(my_full_libs_manifest_files))) fixed_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest.xml.fixed $(full_android_manifest): PRIVATE_LIBS_MANIFESTS := $(my_full_libs_manifest_files) - $(full_android_manifest): $(ANDROID_MANIFEST_MERGER_DEPS) + $(full_android_manifest): $(ANDROID_MANIFEST_MERGER) $(full_android_manifest) : $(fixed_android_manifest) $(my_full_libs_manifest_files) @echo "Merge android manifest files: $@ <-- $< $(PRIVATE_LIBS_MANIFESTS)" @mkdir -p $(dir $@)