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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/chrome_apk.gyp

Issue 1320253002: Merge ChromeMainDelegateStagingAndroid into ChromeMainDelegateAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: used more specific DEPS rule Created 5 years, 3 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 | chrome/app/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/chrome_apk.gyp
diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp
index 6e452b78c921d21034d216df469254a6a2479e57..cd9937bd3de6e83e093cdea78cbcec40519e8d4d 100644
--- a/chrome/android/chrome_apk.gyp
+++ b/chrome/android/chrome_apk.gyp
@@ -20,8 +20,8 @@
# chrome-apk but not in the published static_library which is included in the
# real chrome for android.
'chrome_public_app_native_sources': [
+ '../app/android/chrome_main_delegate_android_initializer.cc',
'../browser/android/chrome_entry_point.cc',
- '../browser/android/chrome_main_delegate_staging_android_initializer.cc',
],
},
'targets': [
« no previous file with comments | « no previous file | chrome/app/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698