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

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: 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
« build/android/ndk.gyp ('K') | « 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 cflags = [ "-Wno-unused-function" ]
Nico 2016/01/05 19:42:36 That's not correct, for two reasons: 1. This is l
Kibeom Kim (inactive) 2016/01/05 20:41:22 Done.
9 } 10 }
10 11
11 # This is the GN version of 12 # This is the GN version of
12 # //build/android/ndk.gyp:cpu_features 13 # //build/android/ndk.gyp:cpu_features
13 source_set("cpu_features") { 14 source_set("cpu_features") {
14 sources = [ 15 sources = [
15 "ndk/sources/android/cpufeatures/cpu-features.c", 16 "ndk/sources/android/cpufeatures/cpu-features.c",
16 ] 17 ]
17 public_configs = [ ":cpu_features_include" ] 18 public_configs = [ ":cpu_features_include" ]
18 19
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 ] 104 ]
104 proguard_preprocess = true 105 proguard_preprocess = true
105 proguard_config = "//third_party/android_tools/proguard.flags" 106 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" 107 jar_path = "$android_sdk_root/extras/google/google_play_services/libproject/go ogle-play-services_lib/libs/google-play-services.jar"
107 } 108 }
108 109
109 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it. 110 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it.
110 android_java_prebuilt("legacy_http_javalib") { 111 android_java_prebuilt("legacy_http_javalib") {
111 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar" 112 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar"
112 } 113 }
OLDNEW
« build/android/ndk.gyp ('K') | « build/android/ndk.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698