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

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

Issue 11363150: Support Java resources within content and chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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/android/ant/chromium-jars.xml » ('j') | build/java.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/ant/chromium-apk.xml
diff --git a/build/android/ant/chromium-apk.xml b/build/android/ant/chromium-apk.xml
index 6ff1ebc0381c3a0c90c4d44503fdec6e7228e94f..e17c80d055bfc5bbee02cea03aef4768f5616b52 100644
--- a/build/android/ant/chromium-apk.xml
+++ b/build/android/ant/chromium-apk.xml
@@ -31,6 +31,19 @@
<filelist files="${GENERATED_SRC_DIRS}"/>
</path>
+ <!-- Include additional resource folders in the apk, e.g. content/.../res.
+ We list the res folders in project.library.res.folder.path and the
+ corresponding java packages in project.library.packages, which must be
+ semicolon-delimited while ADDITION_RES_PACKAGES is space-delimited, hence
cjhopman 2012/11/09 22:21:30 ADDITION_RES_PACKAGES is misspelled.
newt (away) 2012/11/09 23:05:35 Done.
+ the javascript task. -->
cjhopman 2012/11/09 22:21:30 Nit: Use multi-line comment formatting like on lin
newt (away) 2012/11/09 23:05:35 Done.
+ <path id="project.library.res.folder.path">
+ <filelist files="${ADDITIONAL_RES_DIRS}"/>
+ </path>
+ <script language="javascript">
+ var before = project.getProperty("ADDITIONAL_RES_PACKAGES");
cjhopman 2012/11/09 22:21:30 Nit: indent 2, not 4
newt (away) 2012/11/09 23:05:35 Done.
+ project.setProperty("project.library.packages", before.replaceAll(" ", ";"));
+ </script>
+
<property-value name="target.abi" value="${APP_ABI}"/>
<property name="resource.absolute.dir" value="${RESOURCE_DIR}"/>
<property-value name="gen.absolute.dir" value="${out.dir}/gen"/>
« no previous file with comments | « no previous file | build/android/ant/chromium-jars.xml » ('j') | build/java.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698