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

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

Issue 1564443002: Fix x64 android_tools target compile failure. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed comments Created 4 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 unified diff | Download patch
« no previous file with comments | « build/android/ndk.gyp ('k') | 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 = [ "ndk/sources/android/cpufeatures" ]
9 } 9 }
10 10
11 config("cpu_features_warnings") {
12 if (is_clang) {
13 # cpu-features.c has few unused functions on x86 b/26403333
14 cflags = [ "-Wno-unused-function" ]
15 }
16 }
17
11 # This is the GN version of 18 # This is the GN version of
12 # //build/android/ndk.gyp:cpu_features 19 # //build/android/ndk.gyp:cpu_features
13 source_set("cpu_features") { 20 source_set("cpu_features") {
14 sources = [ 21 sources = [
15 "ndk/sources/android/cpufeatures/cpu-features.c", 22 "ndk/sources/android/cpufeatures/cpu-features.c",
16 ] 23 ]
17 public_configs = [ ":cpu_features_include" ] 24 public_configs = [ ":cpu_features_include" ]
18 25
19 configs -= [ "//build/config/compiler:chromium_code" ] 26 configs -= [ "//build/config/compiler:chromium_code" ]
20 configs += [ "//build/config/compiler:no_chromium_code" ] 27 configs += [
28 "//build/config/compiler:no_chromium_code",
29
30 # Must be after no_chromium_code for warning flags to be ordered correctly.
31 ":cpu_features_warnings",
32 ]
21 } 33 }
22 34
23 android_java_prebuilt("android_gcm_java") { 35 android_java_prebuilt("android_gcm_java") {
24 jar_path = "$android_sdk_root/extras/google/gcm/gcm-client/dist/gcm.jar" 36 jar_path = "$android_sdk_root/extras/google/gcm/gcm-client/dist/gcm.jar"
25 } 37 }
26 38
27 android_java_prebuilt("uiautomator_java") { 39 android_java_prebuilt("uiautomator_java") {
28 jar_path = "$android_sdk/uiautomator.jar" 40 jar_path = "$android_sdk/uiautomator.jar"
29 } 41 }
30 42
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 ] 115 ]
104 proguard_preprocess = true 116 proguard_preprocess = true
105 proguard_config = "//third_party/android_tools/proguard.flags" 117 proguard_config = "//third_party/android_tools/proguard.flags"
106 jar_path = "$android_sdk_root/extras/google/google_play_services/libproject/go ogle-play-services_lib/libs/google-play-services.jar" 118 jar_path = "$android_sdk_root/extras/google/google_play_services/libproject/go ogle-play-services_lib/libs/google-play-services.jar"
107 } 119 }
108 120
109 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it. 121 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it.
110 android_java_prebuilt("legacy_http_javalib") { 122 android_java_prebuilt("legacy_http_javalib") {
111 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar" 123 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar"
112 } 124 }
OLDNEW
« no previous file with comments | « build/android/ndk.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698