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

Unified Diff: build/java_apk.gypi

Issue 724933002: Add support for shared library resources to java_apk build rules for real. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 | « build/config/android/internal_rules.gni ('k') | third_party/android_webview_glue/android_webview_glue.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index 518421886dcead14c8b90eee60440fc2d2b0b523..424355433d5bb42c7535bd07d4a7fc3749f82df9 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -831,10 +831,16 @@
'action_name': 'package_resources',
'message': 'packaging resources for <(_target_name)',
'variables': {
+ 'package_resources_options': [],
'package_resource_zip_input_paths': [
'<(resource_zip_path)',
'>@(dependencies_res_zip_paths)',
],
+ 'conditions': [
+ ['shared_resources == 1', {
+ 'package_resources_options+': ['--shared-resources']
+ }],
+ ],
},
'conditions': [
['is_test_apk == 1', {
@@ -874,6 +880,8 @@
'--no-compress', '<(extensions_to_not_compress)',
'--apk-path', '<(resource_packaged_apk_path)',
+
+ '<@(package_resources_options)',
],
},
{
« no previous file with comments | « build/config/android/internal_rules.gni ('k') | third_party/android_webview_glue/android_webview_glue.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698