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

Unified Diff: chrome/chrome_browser.gypi

Issue 10690023: Upstream support for WebKit shared timer toggling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « chrome/browser/android/process_utils.cc ('k') | chrome/common/render_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 3d6744e2e208619516a1aca86d861583a6418545..ad88f6d90955d83e7979699c5074d846578afc0f 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -106,6 +106,8 @@
'browser/accessibility/invert_bubble_prefs.h',
'browser/android/chrome_startup_flags.cc',
'browser/android/chrome_startup_flags.h',
+ 'browser/android/process_utils.cc',
+ 'browser/android/process_utils.h',
'browser/alternate_nav_url_fetcher.cc',
'browser/alternate_nav_url_fetcher.h',
'browser/app_controller_mac.h',
@@ -4856,6 +4858,9 @@
],
}],
['OS=="android"', {
+ 'dependencies': [
+ 'chrome_browser_jni_headers',
+ ],
'sources': [
'browser/sync/glue/synced_window_delegate_registry.cc',
'browser/sync/glue/synced_window_delegate_registry.h',
@@ -5443,4 +5448,24 @@
'includes': [ '../build/protoc.gypi' ]
},
],
+ 'conditions': [
+ ['OS == "android"', {
+ 'targets': [
+ {
+ 'target_name': 'chrome_browser_jni_headers',
+ 'type': 'none',
+ 'variables': {
+ 'java_sources': [
+ 'android/java/src/org/chromium/chrome/browser/ProcessUtils.java',
+ ],
+ 'jni_headers': [
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/jni/process_utils_jni.h',
+ ],
+ },
+ 'includes': [ '../build/jni_generator.gypi' ],
+ },
+ ],
+ },
+ ],
+ ],
}
« no previous file with comments | « chrome/browser/android/process_utils.cc ('k') | chrome/common/render_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698