Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2392)

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

Issue 177923012: android: Remove unused codegen_input_paths and library_manifest_paths. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
« no previous file with comments | « no previous file | build/java_apk.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/ant/apk-codegen.xml
diff --git a/build/android/ant/apk-codegen.xml b/build/android/ant/apk-codegen.xml
index f9b717141ef9be779845b0b5d65e62c2b77366bb..0ead68cd15d753331a263dfaab0e42347bcd8300 100644
--- a/build/android/ant/apk-codegen.xml
+++ b/build/android/ant/apk-codegen.xml
@@ -61,17 +61,6 @@
<!-- Set to empty if not set by the loadresource above -->
<property name="project.library.packages" value=""/>
- <path id="project.library.manifest.file.path">
- <filelist files="${LIBRARY_MANIFEST_PATHS}"/>
- </path>
-
- <!-- manifest merger default value -->
- <condition property="manifestmerger.enabled"
- value="false"
- else="true">
- <equals arg1="${LIBRARY_MANIFEST_PATHS}" arg2="" />
- </condition>
-
<property name="resource.absolute.dir" value="${RESOURCE_DIR}"/>
<property name="manifest.file" value="${ANDROID_MANIFEST}" />
@@ -82,17 +71,8 @@
<property name="aapt.ignore.assets" value="" />
- <target name="-mergemanifest">
- <mergemanifest
- appManifest="${manifest.abs.file}"
- outManifest="${out.manifest.abs.file}"
- enabled="${manifestmerger.enabled}">
- <library refid="project.library.manifest.file.path" />
- </mergemanifest>
- </target>
-
<!-- Code Generation: compile resources (aapt -> R.java), aidl -->
- <target name="-code-gen" depends="-mergemanifest">
+ <target name="-code-gen">
<mkdir dir="${out.absolute.dir}" />
<mkdir dir="${out.res.absolute.dir}" />
<mkdir dir="${gen.absolute.dir}" />
« no previous file with comments | « no previous file | build/java_apk.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698