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

Unified Diff: base/base.gyp

Issue 1045123005: Remove indirection of cpufeatures.gypi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 | build/android/cpufeatures.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index f8d77654e910d386fdbf4d1326b0ed921d60ab39..94264656ab26bcf2853b2eed7799057da0f98394 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -105,6 +105,7 @@
'dependencies': [
'base_java',
'base_jni_headers',
+ '../build/android/ndk.gyp:cpu_features',
'../third_party/ashmem/ashmem.gyp:ashmem',
],
'link_settings': {
@@ -115,9 +116,6 @@
'sources!': [
'debug/stack_trace_posix.cc',
],
- 'includes': [
- '../build/android/cpufeatures.gypi',
- ],
}],
['os_bsd==1', {
'include_dirs': [
« no previous file with comments | « no previous file | build/android/cpufeatures.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698