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

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

Issue 2373683003: Remove som GYP annotations, remove unused manifest. (Closed)
Patch Set: Fix Created 4 years, 2 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 | « build/buildflag_header.gni ('k') | chromecast/BUILD.gn » ('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 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 = [ "$android_ndk_root/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
19 # //build/android/ndk.gyp:cpu_features
20 source_set("cpu_features") { 18 source_set("cpu_features") {
21 sources = [ 19 sources = [
22 "$android_ndk_root/sources/android/cpufeatures/cpu-features.c", 20 "$android_ndk_root/sources/android/cpufeatures/cpu-features.c",
23 ] 21 ]
24 public_configs = [ ":cpu_features_include" ] 22 public_configs = [ ":cpu_features_include" ]
25 23
26 configs -= [ "//build/config/compiler:chromium_code" ] 24 configs -= [ "//build/config/compiler:chromium_code" ]
27 configs += [ 25 configs += [
28 "//build/config/compiler:no_chromium_code", 26 "//build/config/compiler:no_chromium_code",
29 27
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 ] 136 ]
139 lib_name = "leanback-v17" 137 lib_name = "leanback-v17"
140 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar" 138 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar"
141 } 139 }
142 140
143 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it. 141 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it.
144 android_java_prebuilt("legacy_http_javalib") { 142 android_java_prebuilt("legacy_http_javalib") {
145 testonly = true 143 testonly = true
146 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar" 144 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar"
147 } 145 }
OLDNEW
« no previous file with comments | « build/buildflag_header.gni ('k') | chromecast/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698