| 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 |
| 11 # This is the GN version of | 11 # This is the GN version of |
| 12 # //build/android/ndk.gyp:cpu_features | 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 |
| 23 android_library("preview_java_sources") { | |
| 24 DEPRECATED_java_in_dir = "$android_sdk_root/sources/preview_sources/src" | |
| 25 } | |
| 26 | |
| 27 android_java_prebuilt("android_gcm_java") { | 23 android_java_prebuilt("android_gcm_java") { |
| 28 jar_path = "$android_sdk_root/extras/google/gcm/gcm-client/dist/gcm.jar" | 24 jar_path = "$android_sdk_root/extras/google/gcm/gcm-client/dist/gcm.jar" |
| 29 } | 25 } |
| 30 | 26 |
| 31 android_java_prebuilt("uiautomator_java") { | 27 android_java_prebuilt("uiautomator_java") { |
| 32 jar_path = "$android_sdk/uiautomator.jar" | 28 jar_path = "$android_sdk/uiautomator.jar" |
| 33 } | 29 } |
| 34 | 30 |
| 35 android_resources("android_support_design_resources") { | 31 android_resources("android_support_design_resources") { |
| 36 v14_skip = true | 32 v14_skip = true |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 ] | 142 ] |
| 147 outputs = [ | 143 outputs = [ |
| 148 "$target_gen_dir/checked_sdk_extras_version.stamp", | 144 "$target_gen_dir/checked_sdk_extras_version.stamp", |
| 149 ] | 145 ] |
| 150 } | 146 } |
| 151 | 147 |
| 152 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it. | 148 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it. |
| 153 android_java_prebuilt("legacy_http_javalib") { | 149 android_java_prebuilt("legacy_http_javalib") { |
| 154 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar" | 150 jar_path = "$android_sdk/optional/org.apache.http.legacy.jar" |
| 155 } | 151 } |
| OLD | NEW |