Chromium Code Reviews| 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..b2570086f3ec96935e7711797fe02739b1d52257 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) 2014 The Chromium Authors. All rights reserved. |
|
pasko
2015/01/26 11:52:35
nit: 2015
|
| # 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', |
| + ], |
| }, |
| ], |
| } |