build/android/ant/apk-codegen.xml - Issue 13004007: Enable configuralbe mergemanifest.enabled again. It's reverted on recent refactoring

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/ant/apk-codegen.xml

Issue 13004007: Enable configuralbe mergemanifest.enabled again. It's reverted on recent refactoring (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: build/android/ant/apk-codegen.xml

diff --git a/build/android/ant/apk-codegen.xml b/build/android/ant/apk-codegen.xml

index 64ade7a87fcda82886e89d896455dd77ec6a81e7..e60d6ca163cbd89aa932fd2941d034a6263b325b 100644

--- a/build/android/ant/apk-codegen.xml

+++ b/build/android/ant/apk-codegen.xml

@@ -63,7 +63,11 @@

</path>

- <property name="manifestmerger.enabled" value="false" />

+ <condition property="manifestmerger.enabled"

+ value="false"

+ else="true">

+ <equals arg1="${LIBRARY_MANIFEST_PATHS}" arg2="" />

+ </condition>

« no previous file with comments | « no previous file | no next file » | no next file with comments »