OLD | NEW |
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 |
(...skipping 14 matching lines...) Expand all Loading... |
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 ] |
33 } | 33 } |
34 | 34 |
35 lib_version = "23.2.1" | 35 lib_version = "24.1.1" |
36 lib_path = "$android_sdk_root/extras/android/m2repository/com/android/support" | 36 lib_path = "$android_sdk_root/extras/android/m2repository/com/android/support" |
37 | 37 |
38 android_java_prebuilt("android_gcm_java") { | 38 android_java_prebuilt("android_gcm_java") { |
39 jar_path = "$android_sdk_root/extras/google/gcm/gcm-client/dist/gcm.jar" | 39 jar_path = "$android_sdk_root/extras/google/gcm/gcm-client/dist/gcm.jar" |
40 } | 40 } |
41 | 41 |
42 android_java_prebuilt("emma_device") { | 42 android_java_prebuilt("emma_device") { |
43 jar_path = "$android_sdk_root/tools/lib/emma_device.jar" | 43 jar_path = "$android_sdk_root/tools/lib/emma_device.jar" |
44 } | 44 } |
45 | 45 |
(...skipping 23 matching lines...) Expand all Loading... |
69 | 69 |
70 android_aar_prebuilt("android_support_v13_java") { | 70 android_aar_prebuilt("android_support_v13_java") { |
71 deps = [ | 71 deps = [ |
72 ":android_support_annotations_java", | 72 ":android_support_annotations_java", |
73 ":android_support_v4_java", | 73 ":android_support_v4_java", |
74 ] | 74 ] |
75 lib_name = "support-v13" | 75 lib_name = "support-v13" |
76 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar" | 76 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar" |
77 } | 77 } |
78 | 78 |
| 79 android_aar_prebuilt("android_support_vector_drawable_java") { |
| 80 lib_name = "support-vector-drawable" |
| 81 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar" |
| 82 } |
| 83 |
79 android_aar_prebuilt("android_support_v7_appcompat_java_internal") { | 84 android_aar_prebuilt("android_support_v7_appcompat_java_internal") { |
80 lib_name = "appcompat-v7" | 85 lib_name = "appcompat-v7" |
81 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar" | 86 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar" |
82 } | 87 } |
83 | 88 |
84 java_group("android_support_v7_appcompat_java") { | 89 java_group("android_support_v7_appcompat_java") { |
85 deps = [ | 90 deps = [ |
86 ":android_support_v4_java", | 91 ":android_support_v4_java", |
87 ":android_support_v7_appcompat_java_internal", | 92 ":android_support_v7_appcompat_java_internal", |
| 93 ":android_support_vector_drawable_java", |
88 ] | 94 ] |
89 } | 95 } |
90 | 96 |
91 android_aar_prebuilt("android_support_v7_mediarouter_java") { | 97 android_aar_prebuilt("android_support_v7_mediarouter_java") { |
92 deps = [ | 98 deps = [ |
93 ":android_support_v7_appcompat_java", | 99 ":android_support_v7_appcompat_java", |
94 ] | 100 ] |
95 lib_name = "mediarouter-v7" | 101 lib_name = "mediarouter-v7" |
96 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar" | 102 aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar" |
97 } | 103 } |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 ] | 135 ] |
130 lib_name = "leanback-v17" | 136 lib_name = "leanback-v17" |
131 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" |
132 } | 138 } |
133 | 139 |
134 # 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. |
135 android_java_prebuilt("legacy_http_javalib") { | 141 android_java_prebuilt("legacy_http_javalib") { |
136 testonly = true | 142 testonly = true |
137 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar" | 143 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar" |
138 } | 144 } |
OLD | NEW |