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

Unified Diff: base/base.gypi

Issue 12026020: Merge 175820 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/
Patch Set: Created 7 years, 11 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 | « base/base.gyp ('k') | content/app/android/sandboxed_process_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gypi
===================================================================
--- base/base.gypi (revision 177674)
+++ base/base.gypi (working copy)
@@ -29,6 +29,7 @@
'android/base_jni_registrar.h',
'android/build_info.cc',
'android/build_info.h',
+ 'android/cpu_features.cc',
'android/scoped_java_ref.cc',
'android/scoped_java_ref.h',
'android/jni_android.cc',
« no previous file with comments | « base/base.gyp ('k') | content/app/android/sandboxed_process_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698