diff options
| -rw-r--r-- | chrome/android/BUILD.gn | 6 | ||||
| -rw-r--r-- | chrome/android/chrome_apk.gyp | 1 | ||||
| -rw-r--r-- | chrome/android/java_staging/AndroidManifest.xml | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index a59f6d3..51afa6b 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -750,7 +750,11 @@ copy_ex("chrome_public_apk_assets") { jinja_template("chrome_public_apk_manifest") { input = "java_staging/AndroidManifest.xml" output = "$root_gen_dir/chrome_public_apk_manifest/AndroidManifest.xml" - variables = jinja_variables + [ "min_sdk_version=16" ] + variables = jinja_variables + variables += [ + "min_sdk_version=16", + "target_sdk_version=22", + ] } # GYP: //chrome/android/chrome_apk.gyp:chrome_public_template_resources diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp index 9e0a0a4..d504b57 100644 --- a/chrome/android/chrome_apk.gyp +++ b/chrome/android/chrome_apk.gyp @@ -281,6 +281,7 @@ 'configuration_policy=<(configuration_policy)', 'manifest_package=<(manifest_package)', 'min_sdk_version=16', + 'target_sdk_version=22', ], }, 'includes': [ '../../build/android/jinja_template.gypi' ], diff --git a/chrome/android/java_staging/AndroidManifest.xml b/chrome/android/java_staging/AndroidManifest.xml index dc3e3bb..46a755f 100644 --- a/chrome/android/java_staging/AndroidManifest.xml +++ b/chrome/android/java_staging/AndroidManifest.xml @@ -16,7 +16,7 @@ by a child template that "extends" this file. tools:ignore="MissingVersion"> <!-- android:versionCode and android:versionName is set through gyp. See build/common.gypi --> - <uses-sdk android:minSdkVersion="{{min_sdk_version}}" android:targetSdkVersion="22" /> + <uses-sdk android:minSdkVersion="{{min_sdk_version}}" android:targetSdkVersion="{{target_sdk_version}}" /> <uses-feature android:glEsVersion="0x00020000" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> |