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

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

Issue 1303663003: MMMMM, start building APKs targeted at Marshmallow (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 | « 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 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 sources += [ "$root_build_dir/resources.pak" ] 668 sources += [ "$root_build_dir/resources.pak" ]
669 } 669 }
670 670
671 # GYP: //chrome/android/chrome_apk.gyp:chrome_apk_manifest 671 # GYP: //chrome/android/chrome_apk.gyp:chrome_apk_manifest
672 jinja_template("chrome_public_apk_manifest") { 672 jinja_template("chrome_public_apk_manifest") {
673 input = "java/AndroidManifest.xml" 673 input = "java/AndroidManifest.xml"
674 output = "$root_gen_dir/chrome_public_apk_manifest/AndroidManifest.xml" 674 output = "$root_gen_dir/chrome_public_apk_manifest/AndroidManifest.xml"
675 variables = jinja_variables 675 variables = jinja_variables
676 variables += [ 676 variables += [
677 "min_sdk_version=16", 677 "min_sdk_version=16",
678 "target_sdk_version=22", 678 "target_sdk_version=23",
679 ] 679 ]
680 } 680 }
681 681
682 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_template_resources 682 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_template_resources
683 jinja_template_resources("chrome_public_template_resources") { 683 jinja_template_resources("chrome_public_template_resources") {
684 resources = [ 684 resources = [
685 "java/res_template/xml/searchable.xml", 685 "java/res_template/xml/searchable.xml",
686 "java/res_template/xml/syncadapter.xml", 686 "java/res_template/xml/syncadapter.xml",
687 ] 687 ]
688 res_dir = "java/res_template" 688 res_dir = "java/res_template"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 # TODO(GYP,cjhopman): Does this need version code/name? 753 # TODO(GYP,cjhopman): Does this need version code/name?
754 apk_name = "ChromePublicTest" 754 apk_name = "ChromePublicTest"
755 apk_under_test = ":chrome_public_apk" 755 apk_under_test = ":chrome_public_apk"
756 android_manifest = chrome_public_test_apk_manifest 756 android_manifest = chrome_public_test_apk_manifest
757 deps = [ 757 deps = [
758 ":chrome_public_test_apk_manifest", 758 ":chrome_public_test_apk_manifest",
759 "//chrome/android:chrome_shared_test_java", 759 "//chrome/android:chrome_shared_test_java",
760 ] 760 ]
761 isolate_file = "../chrome_public_test_apk.isolate" 761 isolate_file = "../chrome_public_test_apk.isolate"
762 } 762 }
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