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

Side by Side Diff: chrome/android/BUILD.gn

Issue 1299003003: [GN] Don't hardcode google_play_services dependencies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « build/secondary/third_party/android_tools/BUILD.gn ('k') | mandoline/app/android/BUILD.gn » ('j') | 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/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 import("//build/module_args/v8.gni") 7 import("//build/module_args/v8.gni")
8 import("//chrome/version.gni") 8 import("//chrome/version.gni")
9 import("//testing/test.gni") 9 import("//testing/test.gni")
10 import("//third_party/icu/config.gni") 10 import("//third_party/icu/config.gni")
(...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after
723 asset_location = chrome_public_apk_assets_dir 723 asset_location = chrome_public_apk_assets_dir
724 724
725 deps = [ 725 deps = [
726 ":chrome_java", 726 ":chrome_java",
727 ":chrome_java_resources", 727 ":chrome_java_resources",
728 ":chrome_public", 728 ":chrome_public",
729 ":chrome_public_apk_assets", 729 ":chrome_public_apk_assets",
730 ":chrome_public_apk_manifest", 730 ":chrome_public_apk_manifest",
731 ":chrome_public_template_resources", 731 ":chrome_public_template_resources",
732 "//base:base_java", 732 "//base:base_java",
733 "//third_party/android_tools:google_play_services_default_resources", 733 google_play_services_resources,
734 ] 734 ]
735 } 735 }
736 736
737 chrome_public_test_apk_manifest = 737 chrome_public_test_apk_manifest =
738 "$root_gen_dir/chrome_public_test_apk_manifest/AndroidManifest.xml" 738 "$root_gen_dir/chrome_public_test_apk_manifest/AndroidManifest.xml"
739 739
740 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk_manifest 740 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk_manifest
741 jinja_template("chrome_public_test_apk_manifest") { 741 jinja_template("chrome_public_test_apk_manifest") {
742 input = "javatests/AndroidManifest.xml" 742 input = "javatests/AndroidManifest.xml"
743 output = chrome_public_test_apk_manifest 743 output = chrome_public_test_apk_manifest
744 variables = jinja_variables 744 variables = jinja_variables
745 } 745 }
746 746
747 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk 747 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk
748 instrumentation_test_apk("chrome_public_test_apk") { 748 instrumentation_test_apk("chrome_public_test_apk") {
749 # TODO(GYP,cjhopman): Does this need version code/name? 749 # TODO(GYP,cjhopman): Does this need version code/name?
750 apk_name = "ChromePublicTest" 750 apk_name = "ChromePublicTest"
751 apk_under_test = ":chrome_public_apk" 751 apk_under_test = ":chrome_public_apk"
752 android_manifest = chrome_public_test_apk_manifest 752 android_manifest = chrome_public_test_apk_manifest
753 deps = [ 753 deps = [
754 ":chrome_public_test_apk_manifest", 754 ":chrome_public_test_apk_manifest",
755 "//chrome/android:chrome_shared_test_java", 755 "//chrome/android:chrome_shared_test_java",
756 ] 756 ]
757 isolate_file = "../chrome_public_test_apk.isolate" 757 isolate_file = "../chrome_public_test_apk.isolate"
758 } 758 }
OLDNEW
« no previous file with comments | « build/secondary/third_party/android_tools/BUILD.gn ('k') | mandoline/app/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698