|
|
|
@@ -0,0 +1,401 @@
|
|
|
|
|
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
|
|
|
|
Date: Tue, 29 Jan 2019 01:02:07 +0100
|
|
|
|
|
Subject: Rollback android:minSdkVersion from 19 (KitKat) to 16 (JellyBean)."
|
|
|
|
|
|
|
|
|
|
This reverts commit 9a48587dbd1988cf5066b454e7d09ae35d124366.
|
|
|
|
|
---
|
|
|
|
|
.../test/embedded_test_server/java/AndroidManifest.xml | 2 +-
|
|
|
|
|
android_webview/tools/automated_ui_tests/java/AndroidManifest.xml | 2 +-
|
|
|
|
|
base/android/jni_generator/AndroidManifest.xml | 2 +-
|
|
|
|
|
build/android/AndroidManifest.xml | 2 +-
|
|
|
|
|
build/android/gradle/android.jinja | 2 +-
|
|
|
|
|
chrome/android/BUILD.gn | 8 ++++----
|
|
|
|
|
chrome/android/java/res/layout/autofill_local_card_editor.xml | 4 ++--
|
|
|
|
|
.../test/android/chrome_public_test_support/AndroidManifest.xml | 2 +-
|
|
|
|
|
components/cronet/android/sample/AndroidManifest.xml | 3 +--
|
|
|
|
|
components/cronet/android/sample/javatests/AndroidManifest.xml | 3 +--
|
|
|
|
|
components/cronet/android/test/javaperftests/AndroidManifest.xml | 3 +--
|
|
|
|
|
components/cronet/android/test/javatests/AndroidManifest.xml | 3 +--
|
|
|
|
|
.../test/android/browsertests_apk/AndroidManifest.xml.jinja2 | 2 +-
|
|
|
|
|
content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2 | 2 +-
|
|
|
|
|
content/shell/android/javatests/AndroidManifest.xml | 2 +-
|
|
|
|
|
content/shell/android/linker_test_apk/AndroidManifest.xml.jinja2 | 2 +-
|
|
|
|
|
content/shell/android/shell_apk/AndroidManifest.xml.jinja2 | 2 +-
|
|
|
|
|
docs/android_build_instructions.md | 2 +-
|
|
|
|
|
mojo/public/java/system/javatests/AndroidManifest.xml | 2 +-
|
|
|
|
|
net/android/unittest_support/AndroidManifest.xml | 2 +-
|
|
|
|
|
net/test/android/javatests/AndroidManifest.xml | 2 +-
|
|
|
|
|
remoting/android/java/AndroidManifest.xml.jinja2 | 2 +-
|
|
|
|
|
remoting/android/javatests/AndroidManifest.xml.jinja2 | 2 +-
|
|
|
|
|
testing/android/driver/java/AndroidManifest.xml | 2 +-
|
|
|
|
|
testing/android/native_test/java/AndroidManifest.xml.jinja2 | 2 +-
|
|
|
|
|
tools/android/audio_focus_grabber/java/AndroidManifest.xml | 2 +-
|
|
|
|
|
tools/android/push_apps_to_background/AndroidManifest.xml | 2 +-
|
|
|
|
|
27 files changed, 31 insertions(+), 35 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/android_webview/test/embedded_test_server/java/AndroidManifest.xml b/android_webview/test/embedded_test_server/java/AndroidManifest.xml
|
|
|
|
|
--- a/android_webview/test/embedded_test_server/java/AndroidManifest.xml
|
|
|
|
|
+++ b/android_webview/test/embedded_test_server/java/AndroidManifest.xml
|
|
|
|
|
@@ -8,7 +8,7 @@
|
|
|
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
|
|
|
package="org.chromium.android_webview.test.support">
|
|
|
|
|
|
|
|
|
|
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
|
|
|
|
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
|
|
|
|
|
<uses-permission android:name="android.permission.INTERNET"/>
|
|
|
|
|
|
|
|
|
|
diff --git a/android_webview/tools/automated_ui_tests/java/AndroidManifest.xml b/android_webview/tools/automated_ui_tests/java/AndroidManifest.xml
|
|
|
|
|
--- a/android_webview/tools/automated_ui_tests/java/AndroidManifest.xml
|
|
|
|
|
+++ b/android_webview/tools/automated_ui_tests/java/AndroidManifest.xml
|
|
|
|
|
@@ -10,7 +10,7 @@
|
|
|
|
|
android:versionCode="1"
|
|
|
|
|
android:versionName="1.0" >
|
|
|
|
|
|
|
|
|
|
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
|
|
|
|
|
|
|
|
|
<uses-permission android:name="android.permission.INTERNET" />
|
|
|
|
|
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
|
|
|
|
|
diff --git a/base/android/jni_generator/AndroidManifest.xml b/base/android/jni_generator/AndroidManifest.xml
|
|
|
|
|
--- a/base/android/jni_generator/AndroidManifest.xml
|
|
|
|
|
+++ b/base/android/jni_generator/AndroidManifest.xml
|
|
|
|
|
@@ -7,7 +7,7 @@
|
|
|
|
|
|
|
|
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.jni.generator">
|
|
|
|
|
|
|
|
|
|
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="24" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24" />
|
|
|
|
|
<application></application>
|
|
|
|
|
|
|
|
|
|
</manifest>
|
|
|
|
|
diff --git a/build/android/AndroidManifest.xml b/build/android/AndroidManifest.xml
|
|
|
|
|
--- a/build/android/AndroidManifest.xml
|
|
|
|
|
+++ b/build/android/AndroidManifest.xml
|
|
|
|
|
@@ -15,6 +15,6 @@
|
|
|
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
|
|
package="org.dummy">
|
|
|
|
|
|
|
|
|
|
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="24" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24" />
|
|
|
|
|
|
|
|
|
|
</manifest>
|
|
|
|
|
diff --git a/build/android/gradle/android.jinja b/build/android/gradle/android.jinja
|
|
|
|
|
--- a/build/android/gradle/android.jinja
|
|
|
|
|
+++ b/build/android/gradle/android.jinja
|
|
|
|
|
@@ -52,7 +52,7 @@ android {
|
|
|
|
|
|
|
|
|
|
defaultConfig {
|
|
|
|
|
vectorDrawables.useSupportLibrary = true
|
|
|
|
|
- minSdkVersion 19
|
|
|
|
|
+ minSdkVersion 16
|
|
|
|
|
targetSdkVersion {{ target_sdk_version }}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
|
|
|
|
--- a/chrome/android/BUILD.gn
|
|
|
|
|
+++ b/chrome/android/BUILD.gn
|
|
|
|
|
@@ -63,7 +63,7 @@ jinja_template("chrome_public_android_manifest") {
|
|
|
|
|
output = chrome_public_android_manifest
|
|
|
|
|
variables = chrome_public_jinja_variables
|
|
|
|
|
variables += [
|
|
|
|
|
- "min_sdk_version=19",
|
|
|
|
|
+ "min_sdk_version=16",
|
|
|
|
|
"target_sdk_version=$android_sdk_version",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
@@ -1459,7 +1459,7 @@ template("chrome_public_apk_or_module_tmpl") {
|
|
|
|
|
android_manifest = chrome_modern_public_android_manifest
|
|
|
|
|
android_manifest_dep = ":chrome_modern_public_android_manifest"
|
|
|
|
|
} else {
|
|
|
|
|
- min_sdk_version = 19
|
|
|
|
|
+ min_sdk_version = 16
|
|
|
|
|
android_manifest = chrome_public_android_manifest
|
|
|
|
|
android_manifest_dep = ":chrome_public_android_manifest"
|
|
|
|
|
}
|
|
|
|
|
@@ -1663,7 +1663,7 @@ jinja_template("chrome_public_test_apk_manifest") {
|
|
|
|
|
variables = default_chrome_public_jinja_variables
|
|
|
|
|
variables += [
|
|
|
|
|
"manifest_package=$test_manifest_package",
|
|
|
|
|
- "min_sdk_version=19",
|
|
|
|
|
+ "min_sdk_version=16",
|
|
|
|
|
"target_sdk_version=$android_sdk_version",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
@@ -1674,7 +1674,7 @@ jinja_template("chrome_public_test_vr_apk_manifest") {
|
|
|
|
|
output = chrome_public_test_vr_apk_manifest
|
|
|
|
|
variables = chrome_public_jinja_variables
|
|
|
|
|
variables += [
|
|
|
|
|
- "min_sdk_version=19",
|
|
|
|
|
+ "min_sdk_version=16",
|
|
|
|
|
"target_sdk_version=$android_sdk_version",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
diff --git a/chrome/android/java/res/layout/autofill_local_card_editor.xml b/chrome/android/java/res/layout/autofill_local_card_editor.xml
|
|
|
|
|
--- a/chrome/android/java/res/layout/autofill_local_card_editor.xml
|
|
|
|
|
+++ b/chrome/android/java/res/layout/autofill_local_card_editor.xml
|
|
|
|
|
@@ -19,7 +19,7 @@
|
|
|
|
|
|
|
|
|
|
<!-- TODO(crbug.com/900912): Fix and remove lint ignore -->
|
|
|
|
|
<EditText
|
|
|
|
|
- tools:ignore="Autofill,LabelFor"
|
|
|
|
|
+ tools:ignore="Autofill"
|
|
|
|
|
android:id="@+id/credit_card_name_edit"
|
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
@@ -40,7 +40,7 @@
|
|
|
|
|
|
|
|
|
|
<!-- TODO(crbug.com/900912): Fix and remove lint ignore -->
|
|
|
|
|
<EditText
|
|
|
|
|
- tools:ignore="Autofill,LabelFor"
|
|
|
|
|
+ tools:ignore="Autofill"
|
|
|
|
|
android:id="@+id/credit_card_number_edit"
|
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
diff --git a/chrome/test/android/chrome_public_test_support/AndroidManifest.xml b/chrome/test/android/chrome_public_test_support/AndroidManifest.xml
|
|
|
|
|
--- a/chrome/test/android/chrome_public_test_support/AndroidManifest.xml
|
|
|
|
|
+++ b/chrome/test/android/chrome_public_test_support/AndroidManifest.xml
|
|
|
|
|
@@ -5,7 +5,7 @@
|
|
|
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
|
|
|
package="org.chromium.chrome.tests.support">
|
|
|
|
|
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="22" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" />
|
|
|
|
|
<uses-permission android:name="android.permission.INTERNET" />
|
|
|
|
|
<application>
|
|
|
|
|
<service android:name="org.chromium.chrome.browser.media.TestMediaRouteProviderService"
|
|
|
|
|
diff --git a/components/cronet/android/sample/AndroidManifest.xml b/components/cronet/android/sample/AndroidManifest.xml
|
|
|
|
|
--- a/components/cronet/android/sample/AndroidManifest.xml
|
|
|
|
|
+++ b/components/cronet/android/sample/AndroidManifest.xml
|
|
|
|
|
@@ -9,8 +9,7 @@
|
|
|
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
|
|
package="org.chromium.cronet_sample_apk">
|
|
|
|
|
|
|
|
|
|
- <!-- //components/cronet still needs to support Jelly Bean. See crbug.com/922656 -->
|
|
|
|
|
- <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
|
|
|
|
|
<uses-permission android:name="android.permission.INTERNET"/>
|
|
|
|
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
|
|
|
|
<application android:name="CronetSampleApplication"
|
|
|
|
|
diff --git a/components/cronet/android/sample/javatests/AndroidManifest.xml b/components/cronet/android/sample/javatests/AndroidManifest.xml
|
|
|
|
|
--- a/components/cronet/android/sample/javatests/AndroidManifest.xml
|
|
|
|
|
+++ b/components/cronet/android/sample/javatests/AndroidManifest.xml
|
|
|
|
|
@@ -8,8 +8,7 @@
|
|
|
|
|
doesn't ignore this. -->
|
|
|
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
|
|
package="org.chromium.cronet_sample_apk.tests">
|
|
|
|
|
- <!-- //components/cronet still needs to support Jelly Bean. See crbug.com/922656 -->
|
|
|
|
|
- <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
|
|
|
|
|
<uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
|
|
|
|
|
<!-- We add an application tag here just so that we can indicate that this
|
|
|
|
|
package needs to link against the android.test library, which is
|
|
|
|
|
diff --git a/components/cronet/android/test/javaperftests/AndroidManifest.xml b/components/cronet/android/test/javaperftests/AndroidManifest.xml
|
|
|
|
|
--- a/components/cronet/android/test/javaperftests/AndroidManifest.xml
|
|
|
|
|
+++ b/components/cronet/android/test/javaperftests/AndroidManifest.xml
|
|
|
|
|
@@ -1,8 +1,7 @@
|
|
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
|
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
|
|
package="org.chromium.net">
|
|
|
|
|
- <!-- //components/cronet still needs to support Jelly Bean. See crbug.com/922656 -->
|
|
|
|
|
- <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
|
|
|
|
|
<uses-permission android:name="android.permission.INTERNET"/>
|
|
|
|
|
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
|
|
|
|
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
|
|
|
|
diff --git a/components/cronet/android/test/javatests/AndroidManifest.xml b/components/cronet/android/test/javatests/AndroidManifest.xml
|
|
|
|
|
--- a/components/cronet/android/test/javatests/AndroidManifest.xml
|
|
|
|
|
+++ b/components/cronet/android/test/javatests/AndroidManifest.xml
|
|
|
|
|
@@ -8,8 +8,7 @@
|
|
|
|
|
doesn't ignore this. -->
|
|
|
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
|
|
package="org.chromium.net.tests">
|
|
|
|
|
- <!-- //components/cronet still needs to support Jelly Bean. See crbug.com/922656 -->
|
|
|
|
|
- <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
|
|
|
|
|
<uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
|
|
|
|
|
<!-- We add an application tag here just so that we can indicate that this
|
|
|
|
|
package needs to link against the android.test library, which is
|
|
|
|
|
diff --git a/components/test/android/browsertests_apk/AndroidManifest.xml.jinja2 b/components/test/android/browsertests_apk/AndroidManifest.xml.jinja2
|
|
|
|
|
--- a/components/test/android/browsertests_apk/AndroidManifest.xml.jinja2
|
|
|
|
|
+++ b/components/test/android/browsertests_apk/AndroidManifest.xml.jinja2
|
|
|
|
|
@@ -9,7 +9,7 @@
|
|
|
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
|
|
package="org.chromium.components_browsertests_apk">
|
|
|
|
|
|
|
|
|
|
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
|
|
|
|
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
|
|
|
|
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
|
|
|
|
<uses-permission android:name="android.permission.CAMERA" />
|
|
|
|
|
diff --git a/content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2 b/content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2
|
|
|
|
|
--- a/content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2
|
|
|
|
|
+++ b/content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2
|
|
|
|
|
@@ -9,7 +9,7 @@
|
|
|
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
|
|
package="org.chromium.content_browsertests_apk">
|
|
|
|
|
|
|
|
|
|
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
|
|
|
|
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
|
|
|
|
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
|
|
|
|
<uses-permission android:name="android.permission.CAMERA" />
|
|
|
|
|
diff --git a/content/shell/android/javatests/AndroidManifest.xml b/content/shell/android/javatests/AndroidManifest.xml
|
|
|
|
|
--- a/content/shell/android/javatests/AndroidManifest.xml
|
|
|
|
|
+++ b/content/shell/android/javatests/AndroidManifest.xml
|
|
|
|
|
@@ -6,7 +6,7 @@
|
|
|
|
|
doesn't ignore this. -->
|
|
|
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
|
|
package="org.chromium.content_shell_apk.tests">
|
|
|
|
|
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
|
|
|
|
<uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
|
|
|
|
|
<!-- We add an application tag here just so that we can indicate that this
|
|
|
|
|
package needs to link against the android.test library, which is
|
|
|
|
|
diff --git a/content/shell/android/linker_test_apk/AndroidManifest.xml.jinja2 b/content/shell/android/linker_test_apk/AndroidManifest.xml.jinja2
|
|
|
|
|
--- a/content/shell/android/linker_test_apk/AndroidManifest.xml.jinja2
|
|
|
|
|
+++ b/content/shell/android/linker_test_apk/AndroidManifest.xml.jinja2
|
|
|
|
|
@@ -9,7 +9,7 @@
|
|
|
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
|
|
package="org.chromium.chromium_linker_test_apk">
|
|
|
|
|
|
|
|
|
|
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
|
|
|
|
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
|
|
|
|
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
|
|
|
|
<uses-permission android:name="android.permission.CAMERA" />
|
|
|
|
|
diff --git a/content/shell/android/shell_apk/AndroidManifest.xml.jinja2 b/content/shell/android/shell_apk/AndroidManifest.xml.jinja2
|
|
|
|
|
--- a/content/shell/android/shell_apk/AndroidManifest.xml.jinja2
|
|
|
|
|
+++ b/content/shell/android/shell_apk/AndroidManifest.xml.jinja2
|
|
|
|
|
@@ -9,7 +9,7 @@
|
|
|
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
|
|
package="org.chromium.content_shell_apk">
|
|
|
|
|
|
|
|
|
|
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
|
|
|
|
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
|
|
|
|
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
|
|
|
|
<uses-permission android:name="android.permission.CAMERA"/>
|
|
|
|
|
diff --git a/docs/android_build_instructions.md b/docs/android_build_instructions.md
|
|
|
|
|
--- a/docs/android_build_instructions.md
|
|
|
|
|
+++ b/docs/android_build_instructions.md
|
|
|
|
|
@@ -162,7 +162,7 @@ the version of Android running on a device. Chrome uses this feature to target
|
|
|
|
|
3 different versions using 3 different ninja targets:
|
|
|
|
|
|
|
|
|
|
1. `chrome_public_apk` (ChromePublic.apk)
|
|
|
|
|
- * `minSdkVersion=19` (KitKat).
|
|
|
|
|
+ * `minSdkVersion=16` (Jelly Bean).
|
|
|
|
|
* Stores libchrome.so compressed within the APK.
|
|
|
|
|
* Uses [Crazy Linker](https://cs.chromium.org/chromium/src/base/android/linker/BUILD.gn?rcl=6bb29391a86f2be58c626170156cbfaa2cbc5c91&l=9).
|
|
|
|
|
* Shipped only for Android < 21, but still works fine on Android >= 21.
|
|
|
|
|
diff --git a/mojo/public/java/system/javatests/AndroidManifest.xml b/mojo/public/java/system/javatests/AndroidManifest.xml
|
|
|
|
|
--- a/mojo/public/java/system/javatests/AndroidManifest.xml
|
|
|
|
|
+++ b/mojo/public/java/system/javatests/AndroidManifest.xml
|
|
|
|
|
@@ -8,7 +8,7 @@
|
|
|
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
|
|
|
package="org.chromium.mojo.tests">
|
|
|
|
|
|
|
|
|
|
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="21" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
|
|
|
|
|
|
|
|
|
|
<uses-permission android:name="android.permission.INJECT_EVENTS"
|
|
|
|
|
tools:ignore="ProtectedPermissions"/>
|
|
|
|
|
diff --git a/net/android/unittest_support/AndroidManifest.xml b/net/android/unittest_support/AndroidManifest.xml
|
|
|
|
|
--- a/net/android/unittest_support/AndroidManifest.xml
|
|
|
|
|
+++ b/net/android/unittest_support/AndroidManifest.xml
|
|
|
|
|
@@ -10,7 +10,7 @@ found in the LICENSE file.
|
|
|
|
|
android:versionCode="1"
|
|
|
|
|
android:versionName="1.0">
|
|
|
|
|
|
|
|
|
|
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
|
|
|
|
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
|
|
|
|
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
|
|
|
|
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
|
|
|
|
|
diff --git a/net/test/android/javatests/AndroidManifest.xml b/net/test/android/javatests/AndroidManifest.xml
|
|
|
|
|
--- a/net/test/android/javatests/AndroidManifest.xml
|
|
|
|
|
+++ b/net/test/android/javatests/AndroidManifest.xml
|
|
|
|
|
@@ -8,7 +8,7 @@
|
|
|
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
|
|
|
package="org.chromium.net.test.support">
|
|
|
|
|
|
|
|
|
|
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
|
|
|
|
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
|
|
|
|
|
<uses-permission android:name="android.permission.INTERNET"/>
|
|
|
|
|
|
|
|
|
|
diff --git a/remoting/android/java/AndroidManifest.xml.jinja2 b/remoting/android/java/AndroidManifest.xml.jinja2
|
|
|
|
|
--- a/remoting/android/java/AndroidManifest.xml.jinja2
|
|
|
|
|
+++ b/remoting/android/java/AndroidManifest.xml.jinja2
|
|
|
|
|
@@ -1,7 +1,7 @@
|
|
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
|
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
|
|
package="{{ APK_PACKAGE_NAME }}">
|
|
|
|
|
- <uses-sdk android:minSdkVersion="19"
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="14"
|
|
|
|
|
android:targetSdkVersion="28"/>
|
|
|
|
|
<uses-permission android:name="android.permission.INTERNET"/>
|
|
|
|
|
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
|
|
|
|
|
diff --git a/remoting/android/javatests/AndroidManifest.xml.jinja2 b/remoting/android/javatests/AndroidManifest.xml.jinja2
|
|
|
|
|
--- a/remoting/android/javatests/AndroidManifest.xml.jinja2
|
|
|
|
|
+++ b/remoting/android/javatests/AndroidManifest.xml.jinja2
|
|
|
|
|
@@ -11,7 +11,7 @@
|
|
|
|
|
<!-- We add an application tag here just so that we can indicate that this
|
|
|
|
|
package needs to link against the android.test library, which is
|
|
|
|
|
needed when building test cases. -->
|
|
|
|
|
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
|
|
|
|
|
<uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
|
|
|
|
|
<application>
|
|
|
|
|
<uses-library android:name="android.test.runner" />
|
|
|
|
|
diff --git a/testing/android/driver/java/AndroidManifest.xml b/testing/android/driver/java/AndroidManifest.xml
|
|
|
|
|
--- a/testing/android/driver/java/AndroidManifest.xml
|
|
|
|
|
+++ b/testing/android/driver/java/AndroidManifest.xml
|
|
|
|
|
@@ -10,7 +10,7 @@ found in the LICENSE file.
|
|
|
|
|
android:versionCode="1"
|
|
|
|
|
android:versionName="1.0">
|
|
|
|
|
|
|
|
|
|
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
|
|
|
|
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
|
|
|
|
|
|
|
|
|
|
<application android:label="OnDeviceInstrumentationDriver" />
|
|
|
|
|
diff --git a/testing/android/native_test/java/AndroidManifest.xml.jinja2 b/testing/android/native_test/java/AndroidManifest.xml.jinja2
|
|
|
|
|
--- a/testing/android/native_test/java/AndroidManifest.xml.jinja2
|
|
|
|
|
+++ b/testing/android/native_test/java/AndroidManifest.xml.jinja2
|
|
|
|
|
@@ -10,7 +10,7 @@ found in the LICENSE file.
|
|
|
|
|
android:versionCode="1"
|
|
|
|
|
android:versionName="1.0">
|
|
|
|
|
|
|
|
|
|
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
|
|
|
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
|
|
|
|
<uses-permission android:name="android.permission.BLUETOOTH"/>
|
|
|
|
|
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
|
|
|
|
|
diff --git a/tools/android/audio_focus_grabber/java/AndroidManifest.xml b/tools/android/audio_focus_grabber/java/AndroidManifest.xml
|
|
|
|
|
--- a/tools/android/audio_focus_grabber/java/AndroidManifest.xml
|
|
|
|
|
+++ b/tools/android/audio_focus_grabber/java/AndroidManifest.xml
|
|
|
|
|
@@ -8,7 +8,7 @@
|
|
|
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
|
|
package="org.chromium.tools.audio_focus_grabber" >
|
|
|
|
|
|
|
|
|
|
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
|
|
|
|
|
|
|
|
|
<application
|
|
|
|
|
android:label="@string/app_name" >
|
|
|
|
|
diff --git a/tools/android/push_apps_to_background/AndroidManifest.xml b/tools/android/push_apps_to_background/AndroidManifest.xml
|
|
|
|
|
--- a/tools/android/push_apps_to_background/AndroidManifest.xml
|
|
|
|
|
+++ b/tools/android/push_apps_to_background/AndroidManifest.xml
|
|
|
|
|
@@ -10,7 +10,7 @@
|
|
|
|
|
android:versionCode="1"
|
|
|
|
|
android:versionName="1.0" >
|
|
|
|
|
|
|
|
|
|
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
|
|
|
|
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
|
|
|
|
|
|
|
|
|
<application
|
|
|
|
|
android:icon="@drawable/ic_launcher"
|
|
|
|
|
--
|
|
|
|
|
2.11.0
|
|
|
|
|
|
csagan5