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

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

Issue 1108173002: Roll //build, //native_client, and a few more targets of opportunity. Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Test fix Created 5 years, 8 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
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 # This is the GN version of 11 # This is the GN version of
12 # //build/android/cpufeatures.gypi:cpufeatures 12 # //build/android/ndk.gyp:cpu_features
13 source_set("cpu_features") { 13 source_set("cpu_features") {
14 sources = [ 14 sources = [
15 "ndk/sources/android/cpufeatures/cpu-features.c", 15 "ndk/sources/android/cpufeatures/cpu-features.c",
16 ] 16 ]
17 public_configs = [ ":cpu_features_include" ] 17 public_configs = [ ":cpu_features_include" ]
18 18
19 configs -= [ "//build/config/compiler:chromium_code" ] 19 configs -= [ "//build/config/compiler:chromium_code" ]
20 configs += [ "//build/config/compiler:no_chromium_code" ] 20 configs += [ "//build/config/compiler:no_chromium_code" ]
21 } 21 }
22 22
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 } 58 }
59 59
60 android_java_prebuilt("android_support_v7_mediarouter_java") { 60 android_java_prebuilt("android_support_v7_mediarouter_java") {
61 deps = [ 61 deps = [
62 ":android_support_v7_mediarouter_resources", 62 ":android_support_v7_mediarouter_resources",
63 ":android_support_v7_appcompat_java", 63 ":android_support_v7_appcompat_java",
64 ] 64 ]
65 jar_path = "$android_sdk_root/extras/android/support/v7/mediarouter/libs/andro id-support-v7-mediarouter.jar" 65 jar_path = "$android_sdk_root/extras/android/support/v7/mediarouter/libs/andro id-support-v7-mediarouter.jar"
66 } 66 }
67 67
68 android_java_prebuilt("android_support_v7_recyclerview_java") {
69 deps = [
70 ":android_support_v7_appcompat_java",
71 ]
72 jar_path = "$android_sdk_root/extras/android/support/v7/recyclerview/libs/andr oid-support-v7-recyclerview.jar"
73 }
74
68 android_resources("google_play_services_default_resources") { 75 android_resources("google_play_services_default_resources") {
69 v14_verify_only = true 76 v14_verify_only = true
70 resource_dirs = [ "$android_sdk_root/extras/google/google_play_services/libpro ject/google-play-services_lib/res" ] 77 resource_dirs = [ "$android_sdk_root/extras/google/google_play_services/libpro ject/google-play-services_lib/res" ]
71 custom_package = "com.google.android.gms" 78 custom_package = "com.google.android.gms"
72 } 79 }
73 android_java_prebuilt("google_play_services_default_java") { 80 android_java_prebuilt("google_play_services_default_java") {
74 deps = [ 81 deps = [
75 ":android_support_v13_java", 82 ":android_support_v13_java",
76 ":google_play_services_default_resources", 83 ":google_play_services_default_resources",
77 ] 84 ]
78 jar_path = "$android_sdk_root/extras/google/google_play_services/libproject/go ogle-play-services_lib/libs/google-play-services.jar" 85 jar_path = "$android_sdk_root/extras/google/google_play_services/libproject/go ogle-play-services_lib/libs/google-play-services.jar"
79 } 86 }
OLDNEW
« no previous file with comments | « build/sanitizers/tsan_suppressions.cc ('k') | build/secondary/third_party/leveldatabase/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698