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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/base.gyp

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/android/java/src/org/chromium/base/CpuFeatures.java ('k') | base/base.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
===================================================================
--- base/base.gyp (revision 177674)
+++ base/base.gyp (working copy)
@@ -141,6 +141,9 @@
'sources!': [
'debug/stack_trace_posix.cc',
],
+ 'includes': [
+ '../build/android/cpufeatures.gypi',
+ ],
}],
['OS == "android" and _toolset == "target" and android_build_type == 0', {
'dependencies': [
@@ -1018,6 +1021,7 @@
'type': 'none',
'sources': [
'android/java/src/org/chromium/base/BuildInfo.java',
+ 'android/java/src/org/chromium/base/CpuFeatures.java',
'android/java/src/org/chromium/base/LocaleUtils.java',
'android/java/src/org/chromium/base/PathService.java',
'android/java/src/org/chromium/base/PathUtils.java',
« no previous file with comments | « base/android/java/src/org/chromium/base/CpuFeatures.java ('k') | base/base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698