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

Unified Diff: build/android/ndk.gyp

Issue 864323002: Move NDK gyp file from third_party/android_tools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changing year is hard Created 5 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 | « build/android/cpufeatures.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/ndk.gyp
diff --git a/third_party/iccjpeg/iccjpeg.gyp b/build/android/ndk.gyp
similarity index 54%
copy from third_party/iccjpeg/iccjpeg.gyp
copy to build/android/ndk.gyp
index 780114858afb8778d8874f251f0a4b98aa41ebbe..2838a9857e991184cf3a7adf039b8d380dd6fb4b 100644
--- a/third_party/iccjpeg/iccjpeg.gyp
+++ b/build/android/ndk.gyp
@@ -1,24 +1,20 @@
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2015 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'targets': [
{
- 'target_name': 'iccjpeg',
+ 'target_name': 'cpu_features',
'type': 'static_library',
- 'dependencies': [
- '<(libjpeg_gyp_path):libjpeg',
- ],
- 'sources': [
- 'iccjpeg.c',
- 'iccjpeg.h',
- ],
'direct_dependent_settings': {
'include_dirs': [
- '.',
+ '<(android_ndk_root)/sources/android/cpufeatures',
],
},
+ 'sources': [
+ '<(android_ndk_root)/sources/android/cpufeatures/cpu-features.c',
+ ],
},
],
}
« no previous file with comments | « build/android/cpufeatures.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698