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

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

Issue 1160423003: Added jinja variable target_sdk_version to chrome_public_apk_manifest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added change to gn Created 5 years, 6 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 | « no previous file | chrome/android/chrome_apk.gyp » ('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 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 deps += [ "//v8" ] 743 deps += [ "//v8" ]
744 } 744 }
745 745
746 sources += [ "$root_build_dir/resources.pak" ] 746 sources += [ "$root_build_dir/resources.pak" ]
747 } 747 }
748 748
749 # GYP: //chrome/android/chrome_apk.gyp:chrome_apk_manifest 749 # GYP: //chrome/android/chrome_apk.gyp:chrome_apk_manifest
750 jinja_template("chrome_public_apk_manifest") { 750 jinja_template("chrome_public_apk_manifest") {
751 input = "java_staging/AndroidManifest.xml" 751 input = "java_staging/AndroidManifest.xml"
752 output = "$root_gen_dir/chrome_public_apk_manifest/AndroidManifest.xml" 752 output = "$root_gen_dir/chrome_public_apk_manifest/AndroidManifest.xml"
753 variables = jinja_variables + [ "min_sdk_version=16" ] 753 variables = jinja_variables
754 variables += [
755 "min_sdk_version=16",
756 "target_sdk_version=22",
757 ]
754 } 758 }
755 759
756 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_template_resources 760 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_template_resources
757 jinja_template_resources("chrome_public_template_resources") { 761 jinja_template_resources("chrome_public_template_resources") {
758 resources = [ 762 resources = [
759 "java_staging/res_template/xml/searchable.xml", 763 "java_staging/res_template/xml/searchable.xml",
760 "java_staging/res_template/xml/syncadapter.xml", 764 "java_staging/res_template/xml/syncadapter.xml",
761 ] 765 ]
762 res_dir = "java_staging/res_template" 766 res_dir = "java_staging/res_template"
763 variables = jinja_variables 767 variables = jinja_variables
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
825 apk_name = "ChromePublicTest" 829 apk_name = "ChromePublicTest"
826 apk_under_test = ":chrome_public_apk" 830 apk_under_test = ":chrome_public_apk"
827 android_manifest = chrome_public_test_apk_manifest 831 android_manifest = chrome_public_test_apk_manifest
828 deps = [ 832 deps = [
829 ":chrome_public_test_apk_manifest", 833 ":chrome_public_test_apk_manifest",
830 "//chrome/test/android:chrome_staging_test_support_java", 834 "//chrome/test/android:chrome_staging_test_support_java",
831 "//chrome/android:chrome_staging_test_java", 835 "//chrome/android:chrome_staging_test_java",
832 ] 836 ]
833 isolate_file = "../chrome_public_test_apk.isolate" 837 isolate_file = "../chrome_public_test_apk.isolate"
834 } 838 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/chrome_apk.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698