Android V: rolling DEPS entries to start using Android V by default
Bug: 341901237 Change-Id: Iec05a0a95a4892dd7dbe4b18e3f0c158f679c79c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5649225 Reviewed-by: Richard (Torne) Coles <torne@chromium.org> Commit-Queue: Sam Maier <smaier@chromium.org> Cr-Commit-Position: refs/heads/main@{#1323305}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
7e552fb911
commit
75c9571291
DEPS
android_webview/expectations
system_webview_32_64_bundle.AndroidManifest.expectedsystem_webview_32_bundle.AndroidManifest.expectedsystem_webview_64_bundle.AndroidManifest.expectedtrichrome_webview_32_64_bundle.AndroidManifest.expectedtrichrome_webview_32_bundle.AndroidManifest.expectedtrichrome_webview_64_32_bundle.AndroidManifest.expectedtrichrome_webview_64_bundle.AndroidManifest.expected
build
chrome/android/expectations
monochrome_32_64_public_bundle__base.AndroidManifest.expectedmonochrome_32_public_bundle__base.AndroidManifest.expectedmonochrome_64_32_public_bundle__base.AndroidManifest.expectedmonochrome_64_32_public_bundle__cablev2_authenticator.AndroidManifest.expectedmonochrome_64_32_public_bundle__chrome.AndroidManifest.expectedmonochrome_64_32_public_bundle__dev_ui.AndroidManifest.expectedmonochrome_64_32_public_bundle__stack_unwinder.AndroidManifest.expectedmonochrome_64_32_public_bundle__test_dummy.AndroidManifest.expectedmonochrome_64_public_bundle__base.AndroidManifest.expectedtrichrome_chrome_32_64_bundle__base.AndroidManifest.expectedtrichrome_chrome_32_bundle__base.AndroidManifest.expectedtrichrome_chrome_64_32_bundle__base.AndroidManifest.expectedtrichrome_chrome_64_bundle__base.AndroidManifest.expectedtrichrome_library_32_64_apk.AndroidManifest.expectedtrichrome_library_32_apk.AndroidManifest.expectedtrichrome_library_64_32_apk.AndroidManifest.expectedtrichrome_library_64_apk.AndroidManifest.expected
third_party
12
DEPS
12
DEPS
@ -410,7 +410,7 @@ vars = {
|
||||
# Three lines of non-changing comments so that
|
||||
# the commit queue can handle CLs rolling android_sdk_build-tools_version
|
||||
# and whatever else without interference from each other.
|
||||
'android_sdk_build-tools_version': 'YK9Rzw3fDzMHVzatNN6VlyoD_81amLZpN1AbmkdOd6AC',
|
||||
'android_sdk_build-tools_version': 'DxwAZ3hD551Neu6ycuW5CPnXFrdleRBd93oX1eB_m9YC',
|
||||
# Three lines of non-changing comments so that
|
||||
# the commit queue can handle CLs rolling android_sdk_emulator_version
|
||||
# and whatever else without interference from each other.
|
||||
@ -418,11 +418,11 @@ vars = {
|
||||
# Three lines of non-changing comments so that
|
||||
# the commit queue can handle CLs rolling android_sdk_platform-tools_version
|
||||
# and whatever else without interference from each other.
|
||||
'android_sdk_platform-tools_version': 'HWVsGs2HCKgSVv41FsOcsfJbNcB0UFiNrF6Tc4yRArYC',
|
||||
'android_sdk_platform-tools_version': 'WihaseZR6cojZbkzIqwGhpTp92ztaGfqq8njBU8eTXYC',
|
||||
# Three lines of non-changing comments so that
|
||||
# the commit queue can handle CLs rolling android_sdk_platforms_version
|
||||
# and whatever else without interference from each other.
|
||||
'android_sdk_platforms_version': 'u-bhWbTME6u-DjypTgr3ZikCyeAeU6txkR9ET6Uudc8C',
|
||||
'android_sdk_platforms_version': 'kIXA-9XuCfOESodXEdOBkW5f1ytrGWdbp3HFp1I8A_0C',
|
||||
# Three lines of non-changing comments so that
|
||||
# the commit queue can handle CLs rolling feed
|
||||
# and whatever else without interference from each other.
|
||||
@ -1451,7 +1451,7 @@ deps = {
|
||||
'packages': [
|
||||
{
|
||||
'package': 'chromium/third_party/android_system_sdk/public',
|
||||
'version': '4QeolYaSKWBtVTgzJU4tHUfzA9OJTDM8YUcD426IctwC',
|
||||
'version': 'XzzECzCzGLrccJS1U-HdmM5VMh9BotgQ_mWhFQ464PwC',
|
||||
},
|
||||
],
|
||||
'condition': 'checkout_android',
|
||||
@ -1516,7 +1516,7 @@ deps = {
|
||||
'src/third_party/android_sdk/public': {
|
||||
'packages': [
|
||||
{
|
||||
'package': 'chromium/third_party/android_sdk/public/build-tools/34.0.0',
|
||||
'package': 'chromium/third_party/android_sdk/public/build-tools/35.0.0',
|
||||
'version': Var('android_sdk_build-tools_version'),
|
||||
},
|
||||
{
|
||||
@ -1528,7 +1528,7 @@ deps = {
|
||||
'version': Var('android_sdk_platform-tools_version'),
|
||||
},
|
||||
{
|
||||
'package': 'chromium/third_party/android_sdk/public/platforms/android-34',
|
||||
'package': 'chromium/third_party/android_sdk/public/platforms/android-35',
|
||||
'version': Var('android_sdk_platforms_version'),
|
||||
},
|
||||
{
|
||||
|
@ -2,8 +2,8 @@
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.android.webview"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:isolatedSplits="true"
|
||||
android:versionCode="OFFSET=1"
|
||||
android:versionName="#.#.#.#">
|
||||
@ -15,7 +15,7 @@
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="35"/>
|
||||
<application
|
||||
android:name="org.chromium.android_webview.nonembedded.WebViewApkApplication"
|
||||
android:extractNativeLibs="false"
|
||||
|
@ -2,8 +2,8 @@
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.android.webview"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:isolatedSplits="true"
|
||||
android:versionCode="OFFSET=0"
|
||||
android:versionName="#.#.#.#">
|
||||
@ -15,7 +15,7 @@
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="35"/>
|
||||
<application
|
||||
android:name="org.chromium.android_webview.nonembedded.WebViewApkApplication"
|
||||
android:extractNativeLibs="false"
|
||||
|
@ -2,8 +2,8 @@
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.android.webview"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:isolatedSplits="true"
|
||||
android:versionCode="OFFSET=4"
|
||||
android:versionName="#.#.#.#">
|
||||
@ -15,7 +15,7 @@
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="35"/>
|
||||
<application
|
||||
android:name="org.chromium.android_webview.nonembedded.WebViewApkApplication"
|
||||
android:extractNativeLibs="false"
|
||||
|
@ -2,8 +2,8 @@
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.android.webview"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:isolatedSplits="true"
|
||||
android:versionCode="OFFSET=31"
|
||||
android:versionName="#.#.#.#">
|
||||
@ -15,7 +15,7 @@
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="35"/>
|
||||
<application
|
||||
android:name="org.chromium.android_webview.nonembedded.WebViewApkApplication"
|
||||
android:extractNativeLibs="false"
|
||||
|
@ -2,8 +2,8 @@
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.android.webview"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:isolatedSplits="true"
|
||||
android:versionCode="OFFSET=30"
|
||||
android:versionName="#.#.#.#">
|
||||
@ -15,7 +15,7 @@
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="35"/>
|
||||
<application
|
||||
android:name="org.chromium.android_webview.nonembedded.WebViewApkApplication"
|
||||
android:extractNativeLibs="false"
|
||||
|
@ -2,8 +2,8 @@
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.android.webview"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:isolatedSplits="true"
|
||||
android:versionCode="OFFSET=33"
|
||||
android:versionName="#.#.#.#">
|
||||
@ -15,7 +15,7 @@
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="35"/>
|
||||
<application
|
||||
android:name="org.chromium.android_webview.nonembedded.WebViewApkApplication"
|
||||
android:extractNativeLibs="false"
|
||||
|
@ -2,8 +2,8 @@
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.android.webview"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:isolatedSplits="true"
|
||||
android:versionCode="OFFSET=34"
|
||||
android:versionName="#.#.#.#">
|
||||
@ -15,7 +15,7 @@
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="35"/>
|
||||
<application
|
||||
android:name="org.chromium.android_webview.nonembedded.WebViewApkApplication"
|
||||
android:extractNativeLibs="false"
|
||||
|
@ -114,7 +114,7 @@ DEVICE_PERF_OUTPUT_DIR = (
|
||||
|
||||
SCREENSHOTS_DIR = os.path.join(DIR_SOURCE_ROOT, 'out_screenshots')
|
||||
|
||||
ANDROID_SDK_BUILD_TOOLS_VERSION = '34.0.0'
|
||||
ANDROID_SDK_BUILD_TOOLS_VERSION = '35.0.0'
|
||||
ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT, 'third_party', 'android_sdk',
|
||||
'public')
|
||||
ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,
|
||||
|
@ -141,12 +141,12 @@ if (is_android || is_chromeos) {
|
||||
|
||||
public_android_sdk_root = "//third_party/android_sdk/public"
|
||||
public_android_sdk_build_tools =
|
||||
"${public_android_sdk_root}/build-tools/34.0.0"
|
||||
public_android_sdk_version = "34"
|
||||
if (android_sdk_release == "u") {
|
||||
"${public_android_sdk_root}/build-tools/35.0.0"
|
||||
public_android_sdk_version = "35"
|
||||
if (android_sdk_release == "v") {
|
||||
default_android_sdk_root = public_android_sdk_root
|
||||
default_android_sdk_version = public_android_sdk_version
|
||||
default_android_sdk_build_tools_version = "34.0.0"
|
||||
default_android_sdk_build_tools_version = "35.0.0"
|
||||
public_android_sdk = true
|
||||
}
|
||||
|
||||
@ -159,7 +159,7 @@ if (is_android || is_chromeos) {
|
||||
# Purposefully repeated so that downstream can change
|
||||
# default_android_sdk_root without changing lint version.
|
||||
default_lint_android_sdk_root = public_android_sdk_root
|
||||
default_lint_android_sdk_version = 34
|
||||
default_lint_android_sdk_version = 35
|
||||
}
|
||||
|
||||
if (!defined(default_extras_android_sdk_root)) {
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
# The default SDK release used by public builds. Value may differ in
|
||||
# internal builds.
|
||||
default_android_sdk_release = "u"
|
||||
default_android_sdk_release = "v"
|
||||
|
||||
# SDK releases against which public builds are supported.
|
||||
public_sdk_releases = [ "u" ]
|
||||
public_sdk_releases = [ "v" ]
|
||||
|
@ -2,8 +2,8 @@
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.chromium.chrome.stable"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:isolatedSplits="true"
|
||||
android:versionCode="OFFSET=21"
|
||||
android:versionName="#.#.#.#">
|
||||
@ -77,7 +77,7 @@
|
||||
<uses-permission-sdk-23 android:name="android.permission.SCENE_UNDERSTANDING"/>
|
||||
<uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
|
||||
<uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="35"/>
|
||||
<application
|
||||
android:name="org.chromium.chrome.browser.base.SplitMonochromeApplication"
|
||||
android:allowAudioPlaybackCapture="false"
|
||||
|
@ -2,8 +2,8 @@
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.chromium.chrome.stable"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:isolatedSplits="true"
|
||||
android:versionCode="OFFSET=20"
|
||||
android:versionName="#.#.#.#">
|
||||
@ -77,7 +77,7 @@
|
||||
<uses-permission-sdk-23 android:name="android.permission.SCENE_UNDERSTANDING"/>
|
||||
<uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
|
||||
<uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="35"/>
|
||||
<application
|
||||
android:name="org.chromium.chrome.browser.base.SplitMonochromeApplication"
|
||||
android:allowAudioPlaybackCapture="false"
|
||||
|
@ -2,8 +2,8 @@
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.chromium.chrome.stable"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:isolatedSplits="true"
|
||||
android:versionCode="OFFSET=22"
|
||||
android:versionName="#.#.#.#">
|
||||
@ -77,7 +77,7 @@
|
||||
<uses-permission-sdk-23 android:name="android.permission.SCENE_UNDERSTANDING"/>
|
||||
<uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
|
||||
<uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="35"/>
|
||||
<application
|
||||
android:name="org.chromium.chrome.browser.base.SplitMonochromeApplication"
|
||||
android:allowAudioPlaybackCapture="false"
|
||||
|
@ -4,14 +4,14 @@
|
||||
xmlns:dist="http://schemas.android.com/apk/distribution"
|
||||
featureSplit="cablev2_authenticator"
|
||||
package="org.chromium.chrome.stable"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:versionCode="OFFSET=22"
|
||||
android:versionName="#.#.#.#">
|
||||
<dist:module dist:onDemand="false" dist:title="@string/cablev2_authenticator_module_title"> # DIFF-ANCHOR: 4362cefb
|
||||
<dist:fusing dist:include="true"/>
|
||||
</dist:module> # DIFF-ANCHOR: 4362cefb
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="35"/>
|
||||
<uses-split android:name="chrome"/>
|
||||
<application/>
|
||||
</manifest>
|
||||
|
@ -4,8 +4,8 @@
|
||||
xmlns:dist="http://schemas.android.com/apk/distribution"
|
||||
featureSplit="chrome"
|
||||
package="org.chromium.chrome.stable"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:versionCode="OFFSET=22"
|
||||
android:versionName="#.#.#.#">
|
||||
<dist:module dist:onDemand="false"> # DIFF-ANCHOR: 2805007f
|
||||
@ -13,7 +13,7 @@
|
||||
</dist:module> # DIFF-ANCHOR: 2805007f
|
||||
<uses-permission android:name="android.permission.USE_BIOMETRIC"/>
|
||||
<uses-permission android:name="android.permission.USE_FINGERPRINT"/>
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="35"/>
|
||||
<application>
|
||||
<activity # DIFF-ANCHOR: 28dc9019
|
||||
android:name="com.google.ar.core.InstallActivity"
|
||||
|
@ -4,13 +4,13 @@
|
||||
xmlns:dist="http://schemas.android.com/apk/distribution"
|
||||
featureSplit="dev_ui"
|
||||
package="org.chromium.chrome.stable"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:versionCode="OFFSET=22"
|
||||
android:versionName="#.#.#.#">
|
||||
<dist:module dist:onDemand="true" dist:title="@string/dev_ui_module_title"> # DIFF-ANCHOR: 671a5c9f
|
||||
<dist:fusing dist:include="true"/>
|
||||
</dist:module> # DIFF-ANCHOR: 671a5c9f
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="35"/>
|
||||
<application/>
|
||||
</manifest>
|
||||
|
6
chrome/android/expectations/monochrome_64_32_public_bundle__stack_unwinder.AndroidManifest.expected
6
chrome/android/expectations/monochrome_64_32_public_bundle__stack_unwinder.AndroidManifest.expected
@ -4,13 +4,13 @@
|
||||
xmlns:dist="http://schemas.android.com/apk/distribution"
|
||||
featureSplit="stack_unwinder"
|
||||
package="org.chromium.chrome.stable"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:versionCode="OFFSET=22"
|
||||
android:versionName="#.#.#.#">
|
||||
<dist:module dist:onDemand="true" dist:title="@string/stack_unwinder_module_title"> # DIFF-ANCHOR: 2d9e963c
|
||||
<dist:fusing dist:include="true"/>
|
||||
</dist:module> # DIFF-ANCHOR: 2d9e963c
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="35"/>
|
||||
<application/>
|
||||
</manifest>
|
||||
|
@ -4,13 +4,13 @@
|
||||
xmlns:dist="http://schemas.android.com/apk/distribution"
|
||||
featureSplit="test_dummy"
|
||||
package="org.chromium.chrome.stable"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:versionCode="OFFSET=22"
|
||||
android:versionName="#.#.#.#">
|
||||
<dist:module dist:onDemand="true" dist:title="@string/test_dummy_module_title"> # DIFF-ANCHOR: d029b25b
|
||||
<dist:fusing dist:include="true"/>
|
||||
</dist:module> # DIFF-ANCHOR: d029b25b
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="35"/>
|
||||
<application/>
|
||||
</manifest>
|
||||
|
@ -2,8 +2,8 @@
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.chromium.chrome.stable"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:isolatedSplits="true"
|
||||
android:versionCode="OFFSET=24"
|
||||
android:versionName="#.#.#.#">
|
||||
@ -77,7 +77,7 @@
|
||||
<uses-permission-sdk-23 android:name="android.permission.SCENE_UNDERSTANDING"/>
|
||||
<uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
|
||||
<uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="35"/>
|
||||
<application
|
||||
android:name="org.chromium.chrome.browser.base.SplitMonochromeApplication"
|
||||
android:allowAudioPlaybackCapture="false"
|
||||
|
@ -2,8 +2,8 @@
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.chromium.chrome.stable"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:isolatedSplits="true"
|
||||
android:versionCode="OFFSET=31"
|
||||
android:versionName="#.#.#.#">
|
||||
@ -77,7 +77,7 @@
|
||||
<uses-permission-sdk-23 android:name="android.permission.SCENE_UNDERSTANDING"/>
|
||||
<uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
|
||||
<uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="35"/>
|
||||
<application
|
||||
android:name="org.chromium.chrome.browser.base.SplitChromeApplication"
|
||||
android:allowAudioPlaybackCapture="false"
|
||||
|
@ -2,8 +2,8 @@
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.chromium.chrome.stable"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:isolatedSplits="true"
|
||||
android:versionCode="OFFSET=30"
|
||||
android:versionName="#.#.#.#">
|
||||
@ -77,7 +77,7 @@
|
||||
<uses-permission-sdk-23 android:name="android.permission.SCENE_UNDERSTANDING"/>
|
||||
<uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
|
||||
<uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="35"/>
|
||||
<application
|
||||
android:name="org.chromium.chrome.browser.base.SplitChromeApplication"
|
||||
android:allowAudioPlaybackCapture="false"
|
||||
|
@ -2,8 +2,8 @@
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.chromium.chrome.stable"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:isolatedSplits="true"
|
||||
android:versionCode="OFFSET=33"
|
||||
android:versionName="#.#.#.#">
|
||||
@ -77,7 +77,7 @@
|
||||
<uses-permission-sdk-23 android:name="android.permission.SCENE_UNDERSTANDING"/>
|
||||
<uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
|
||||
<uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="35"/>
|
||||
<application
|
||||
android:name="org.chromium.chrome.browser.base.SplitChromeApplication"
|
||||
android:allowAudioPlaybackCapture="false"
|
||||
|
@ -2,8 +2,8 @@
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.chromium.chrome.stable"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:isolatedSplits="true"
|
||||
android:versionCode="OFFSET=34"
|
||||
android:versionName="#.#.#.#">
|
||||
@ -77,7 +77,7 @@
|
||||
<uses-permission-sdk-23 android:name="android.permission.SCENE_UNDERSTANDING"/>
|
||||
<uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
|
||||
<uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="35"/>
|
||||
<application
|
||||
android:name="org.chromium.chrome.browser.base.SplitChromeApplication"
|
||||
android:allowAudioPlaybackCapture="false"
|
||||
|
@ -2,14 +2,14 @@
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.chromium.trichromelibrary"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:versionCode="OFFSET=31"
|
||||
android:versionName="#.#.#.#">
|
||||
<uses-feature android:glEsVersion="0x00020000"/>
|
||||
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
|
||||
<uses-feature android:name="android.software.leanback" android:required="false"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="35"/>
|
||||
<application
|
||||
android:extractNativeLibs="false"
|
||||
android:hasCode="false"
|
||||
|
@ -2,14 +2,14 @@
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.chromium.trichromelibrary"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:versionCode="OFFSET=30"
|
||||
android:versionName="#.#.#.#">
|
||||
<uses-feature android:glEsVersion="0x00020000"/>
|
||||
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
|
||||
<uses-feature android:name="android.software.leanback" android:required="false"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="35"/>
|
||||
<application
|
||||
android:extractNativeLibs="false"
|
||||
android:hasCode="false"
|
||||
|
@ -2,14 +2,14 @@
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.chromium.trichromelibrary"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:versionCode="OFFSET=33"
|
||||
android:versionName="#.#.#.#">
|
||||
<uses-feature android:glEsVersion="0x00020000"/>
|
||||
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
|
||||
<uses-feature android:name="android.software.leanback" android:required="false"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="35"/>
|
||||
<application
|
||||
android:extractNativeLibs="false"
|
||||
android:hasCode="false"
|
||||
|
@ -2,14 +2,14 @@
|
||||
<manifest
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.chromium.trichromelibrary"
|
||||
platformBuildVersionCode="34"
|
||||
platformBuildVersionName="14"
|
||||
platformBuildVersionCode="35"
|
||||
platformBuildVersionName="15"
|
||||
android:versionCode="OFFSET=34"
|
||||
android:versionName="#.#.#.#">
|
||||
<uses-feature android:glEsVersion="0x00020000"/>
|
||||
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
|
||||
<uses-feature android:name="android.software.leanback" android:required="false"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="34"/>
|
||||
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="35"/>
|
||||
<application
|
||||
android:extractNativeLibs="false"
|
||||
android:hasCode="false"
|
||||
|
8
third_party/android_sdk/README.chromium
vendored
8
third_party/android_sdk/README.chromium
vendored
@ -1,12 +1,12 @@
|
||||
Name: Android SDK
|
||||
URL: http://developer.android.com/sdk/index.html
|
||||
Version: 34
|
||||
Android SDK Build-Tools 34.0.0
|
||||
Version: 35
|
||||
Android SDK Build-Tools 35.0.0
|
||||
Android SDK Command-line Tools 7.0
|
||||
Android SDK Emulator 31.2.10
|
||||
Android SDK Patch Applier v4
|
||||
Android SDK Platform-Tools 34.0.3
|
||||
Android SDK Platform API 34
|
||||
Android SDK Platform-Tools 35.0.1
|
||||
Android SDK Platform API 35
|
||||
Android SDK Sources 31
|
||||
Google Cloud Messaging for Android Library, rev 3
|
||||
Security Critical: no
|
||||
|
@ -2,7 +2,7 @@ Name: Android System SDK
|
||||
URL: https://android.googlesource.com/platform/frameworks/base
|
||||
Short Name: Android System SDK
|
||||
Version: 0
|
||||
Revision: UPB3.230519.008
|
||||
Revision: AP31.240517.022
|
||||
License: GPL v2
|
||||
License File: LICENSE
|
||||
Security Critical: No
|
||||
|
Reference in New Issue
Block a user