| commit | 5bcb2fc9a93c9e90e2376567e8acc4e0db7e643f | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Thu May 24 16:10:44 2018 -0700 |
| committer | Colin Cross <ccross@android.com> | Wed Jul 11 09:43:04 2018 -0700 |
| tree | 77edd4b6b2a99f3f03d18cb05099e9ead0267790 | |
| parent | f1429b1c31511c5675bced83c94cab6013bd5099 [diff] [blame] |
Move manifest merger config to Soong Bug: 110848854 Test: m checkbuild Change-Id: Id9a8b4c02ade275eefc32bf72710430e889cd554 Merged-In: Id9a8b4c02ade275eefc32bf72710430e889cd554 Merged-In: Ib20aa4849978283f1da1ce601b28199fc0183e05
diff --git a/core/android_manifest.mk b/core/android_manifest.mk index 3af81ff..517379a 100644 --- a/core/android_manifest.mk +++ b/core/android_manifest.mk
@@ -47,7 +47,7 @@ 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 $@)