summaryrefslogtreecommitdiffstats
path: root/content/content_app.gypi
diff options
context:
space:
mode:
authortorne <torne@chromium.org>2015-04-07 14:02:54 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-07 21:04:34 +0000
commit9845b890dd38f0b88b0304f3bd6c437a7c6f8f8d (patch)
tree95815e0144ddf0c7d06cfa0a21b990bd5a6f0643 /content/content_app.gypi
parent45a7253bdc2863a5e8193e9cfb20a28e2dfb816b (diff)
downloadchromium_src-9845b890dd38f0b88b0304f3bd6c437a7c6f8f8d.zip
chromium_src-9845b890dd38f0b88b0304f3bd6c437a7c6f8f8d.tar.gz
chromium_src-9845b890dd38f0b88b0304f3bd6c437a7c6f8f8d.tar.bz2
Remove indirection of cpufeatures.gypi.
Now that android_webview_build is no longer supported, the extra level of indirection of including cpufeatures.gypi instead of directly depending on the cpufeatures target is not necessary. Remove the cases in the Chromium tree. Other references appear in projects pulled in via DEPS that will have to be fixed separately before cpufeatures.gypi can be entirely deleted. BUG=440793 Review URL: https://codereview.chromium.org/1045123005 Cr-Commit-Position: refs/heads/master@{#324117}
Diffstat (limited to 'content/content_app.gypi')
-rw-r--r--content/content_app.gypi4
1 files changed, 1 insertions, 3 deletions
diff --git a/content/content_app.gypi b/content/content_app.gypi
index d25513d..2681899 100644
--- a/content/content_app.gypi
+++ b/content/content_app.gypi
@@ -50,12 +50,10 @@
],
'dependencies': [
'content.gyp:content_jni_headers',
+ '../build/android/ndk.gyp:cpu_features',
'../skia/skia.gyp:skia',
'../ui/android/ui_android.gyp:ui_android',
],
- 'includes': [
- '../build/android/cpufeatures.gypi',
- ],
}],
['OS=="win"', {
'dependencies': [