p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Update manifest merger to use binary" am: e34ff5ca5d 

am: 9c6a64ea64

Change-Id: I40bcbe199fd4837eededddfa03069015b536f04b
This commit is contained in:
Colin Cross 2019-03-04 14:20:35 -08:00 committed by android-build-merger
parent 05cee18432 9c6a64ea64
commit 51fea3d3b4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/android_manifest.mk
View File

@ -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 $@)