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

Unified Diff: build/secondary/third_party/android_tools/BUILD.gn

Issue 1418573010: Enable downloading Google Play services via deps hook (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase on master Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/install-build-deps-android.sh ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/secondary/third_party/android_tools/BUILD.gn
diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn
index 710b7d7ae3ab58f8f02c72b5f45f41bbe6a59bcd..c849d0359277efa72b1ca903469677b7422abca3 100644
--- a/build/secondary/third_party/android_tools/BUILD.gn
+++ b/build/secondary/third_party/android_tools/BUILD.gn
@@ -93,9 +93,6 @@ android_resources("google_play_services_default_resources") {
v14_skip = true
resource_dirs = [ "$android_sdk_root/extras/google/google_play_services/libproject/google-play-services_lib/res" ]
custom_package = "com.google.android.gms"
- deps = [
- ":check_sdk_extras_version",
- ]
}
android_java_prebuilt("google_play_services_default_java") {
deps = [
@@ -106,34 +103,9 @@ android_java_prebuilt("google_play_services_default_java") {
]
proguard_preprocess = true
proguard_config = "//third_party/android_tools/proguard.flags"
-
- # TODO(dgn) deps should not complain about having a custom action here
- # Currently, there is no guarantee that the data_deps actions will complete before the current one runs
- data_deps = [
- ":check_sdk_extras_version",
- ]
jar_path = "$android_sdk_root/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar"
}
-action("check_sdk_extras_version") {
- script = "//build/check_sdk_extras_version.py"
- args = [
- "--package-id",
- "extra-google-google_play_services",
- "--package-location",
- rebase_path("$android_sdk_root/extras/google/google_play_services"),
- "--stamp",
- rebase_path("$target_gen_dir/checked_sdk_extras_version.stamp"),
- ]
- inputs = [
- "//build/android_sdk_extras.json",
- "$android_sdk_root/extras/google/google_play_services/source.properties",
- ]
- outputs = [
- "$target_gen_dir/checked_sdk_extras_version.stamp",
- ]
-}
-
# TODO(jbudorick): Remove this once net_java_test_support no longer needs it.
android_java_prebuilt("legacy_http_javalib") {
jar_path = "$android_sdk/optional/org.apache.http.legacy.jar"
« no previous file with comments | « build/install-build-deps-android.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698