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

Side by Side Diff: build/android/cpufeatures.gypi

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, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | build/android/ndk.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # Depend on the Android NDK's cpu feature detection. The WebView build is part 5 # Depend on the Android NDK's cpu feature detection. The WebView build is part
6 # of the system and the library already exists; for the normal build there is a 6 # of the system and the library already exists; for the normal build there is a
7 # gyp file in the checked-in NDK to build it. 7 # gyp file in the checked-in NDK to build it.
8 { 8 {
9 'conditions': [ 9 'conditions': [
10 ['android_webview_build == 1', { 10 ['android_webview_build == 1', {
11 # This is specified twice intentionally: Android provides include paths 11 # This is specified twice intentionally: Android provides include paths
12 # to targets automatically if they depend on libraries, so we add this 12 # to targets automatically if they depend on libraries, so we add this
13 # library to every target that includes this .gypi to make the headers 13 # library to every target that includes this .gypi to make the headers
14 # available, then also add it to targets that link those targets via 14 # available, then also add it to targets that link those targets via
15 # link_settings to ensure it ends up being linked even if the main target 15 # link_settings to ensure it ends up being linked even if the main target
16 # doesn't include this .gypi. 16 # doesn't include this .gypi.
17 'libraries': [ 17 'libraries': [
18 'cpufeatures.a', 18 'cpufeatures.a',
19 ], 19 ],
20 'link_settings': { 20 'link_settings': {
21 'libraries': [ 21 'libraries': [
22 'cpufeatures.a', 22 'cpufeatures.a',
23 ], 23 ],
24 }, 24 },
25 }, { 25 }, {
26 'dependencies': [ 26 'dependencies': [
27 '<(android_ndk_root)/android_tools_ndk.gyp:cpu_features', 27 '<(DEPTH)/build/android/ndk.gyp:cpu_features',
28 ], 28 ],
29 }], 29 }],
30 ], 30 ],
31 } 31 }
OLDNEW
« no previous file with comments | « no previous file | build/android/ndk.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698