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

Side by Side Diff: build/secondary/third_party/android_tools/BUILD.gn

Issue 2257933004: [Android] Make cpu_features dependent on configurable android_ndk_root (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 import("//build/config/android/rules.gni") 5 import("//build/config/android/rules.gni")
6 6
7 config("cpu_features_include") { 7 config("cpu_features_include") {
8 include_dirs = [ "ndk/sources/android/cpufeatures" ] 8 include_dirs = [ "$android_ndk_root/sources/android/cpufeatures" ]
9 } 9 }
10 10
11 config("cpu_features_warnings") { 11 config("cpu_features_warnings") {
12 if (is_clang) { 12 if (is_clang) {
13 # cpu-features.c has few unused functions on x86 b/26403333 13 # cpu-features.c has few unused functions on x86 b/26403333
14 cflags = [ "-Wno-unused-function" ] 14 cflags = [ "-Wno-unused-function" ]
15 } 15 }
16 } 16 }
17 17
18 # This is the GN version of 18 # This is the GN version of
19 # //build/android/ndk.gyp:cpu_features 19 # //build/android/ndk.gyp:cpu_features
20 source_set("cpu_features") { 20 source_set("cpu_features") {
21 sources = [ 21 sources = [
22 "ndk/sources/android/cpufeatures/cpu-features.c", 22 "$android_ndk_root/sources/android/cpufeatures/cpu-features.c",
23 ] 23 ]
24 public_configs = [ ":cpu_features_include" ] 24 public_configs = [ ":cpu_features_include" ]
25 25
26 configs -= [ "//build/config/compiler:chromium_code" ] 26 configs -= [ "//build/config/compiler:chromium_code" ]
27 configs += [ 27 configs += [
28 "//build/config/compiler:no_chromium_code", 28 "//build/config/compiler:no_chromium_code",
29 29
30 # Must be after no_chromium_code for warning flags to be ordered correctly. 30 # Must be after no_chromium_code for warning flags to be ordered correctly.
31 ":cpu_features_warnings", 31 ":cpu_features_warnings",
32 ] 32 ]
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 ] 135 ]
136 lib_name = "leanback-v17" 136 lib_name = "leanback-v17"
137 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar" 137 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar"
138 } 138 }
139 139
140 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it. 140 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it.
141 android_java_prebuilt("legacy_http_javalib") { 141 android_java_prebuilt("legacy_http_javalib") {
142 testonly = true 142 testonly = true
143 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar" 143 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar"
144 } 144 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698