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

Unified Diff: webrtc/system_wrappers/cpu_features_linux.gyp

Issue 1820133002: Implement CPU feature detection for ARM Linux. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixes for chromium and x86 builds Created 4 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
Index: webrtc/system_wrappers/cpu_features_linux.gyp
diff --git a/webrtc/system_wrappers/cpu_features_webrtc.gyp b/webrtc/system_wrappers/cpu_features_linux.gyp
similarity index 64%
copy from webrtc/system_wrappers/cpu_features_webrtc.gyp
copy to webrtc/system_wrappers/cpu_features_linux.gyp
index 064b3cf049c116e5efd918a53a8f41882f7dbbe0..85c7c8af70ebbf51b961f6928655c2c506217ff9 100644
--- a/webrtc/system_wrappers/cpu_features_webrtc.gyp
+++ b/webrtc/system_wrappers/cpu_features_linux.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+# Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
kjellander_webrtc 2016/04/04 06:09:45 You already added a target in webrtc/system_wrappe
Simon Hosie 2016/04/05 01:15:48 Done.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
@@ -8,19 +8,19 @@
{
'conditions': [
- ['OS=="android"', {
+ ['OS=="linux"', {
'targets': [
{
- 'target_name': 'cpu_features_android',
+ 'target_name': 'cpu_features_linux',
'type': 'static_library',
'sources': [
- 'source/cpu_features_android.c',
- ],
- 'dependencies': [
- '../../build/android/ndk.gyp:cpu_features',
+ 'source/cpu_features_linux.c',
],
},
],
+ 'dependencies': [
+ '<(webrtc_root)/common.gyp:webrtc_common',
+ ],
}],
], # conditions
}

Powered by Google App Engine
This is Rietveld 408576698