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

Unified Diff: content/content_shell.gypi

Issue 10693157: Add pak file support for content shell and android apks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 5 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 | content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 875e0e72352e46f7804e3341a8be5902174f80cb..4134258b6c6b1412aef03da02e072e09eef03039 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -531,6 +531,10 @@
'shell/android/shell_view.cc',
'shell/android/shell_view.h',
],
+ 'sources!': [
+ 'shell/shell_main.cc',
+ 'shell/shell_main.h',
+ ],
'conditions': [
['android_build_type==1', {
'ldflags': [
@@ -590,6 +594,7 @@
'<(PRODUCT_DIR)/content_shell/java/libs/chromium_net.jar',
'<(PRODUCT_DIR)/content_shell/java/libs/chromium_media.jar',
'<(PRODUCT_DIR)/content_shell/java/libs/chromium_content.jar',
+ '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',
'<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent_shell_content_view.so',
],
'outputs': [
« no previous file with comments | « no previous file | content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698