Bug 1743469 - Target android 31. r=jgraham,jnicol,calu

Differential Revision: https://phabricator.services.mozilla.com/D133153
This commit is contained in:
Agi Sferro 2022-01-11 19:16:03 +00:00
parent 3004b12f76
commit fe94caaf56
8 changed files with 20 additions and 12 deletions

View File

@ -58,8 +58,8 @@ def android_sdk_version(geckoview_lite):
# If you think you can't handle the whole set of changes, please reach out to the Release
# Engineering team.
return namespace(
build_tools_version="30.0.2",
target_sdk_version="30",
build_tools_version="31.0.0",
target_sdk_version="31",
min_sdk_version="16" if geckoview_lite else "21",
)

View File

@ -54,7 +54,7 @@ font-loader = "0.11"
package_name = "org.mozilla.wrench"
label = "Wrench"
# keep it in sync with android-sdk-version in android-sdk.configure
android_version = 30
android_version = 31
target_sdk_version = 18
min_sdk_version = 18
fullscreen = true

View File

@ -13,7 +13,9 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
<activity
android:exported="true"
android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -22,4 +24,4 @@
</activity>
</application>
</manifest>
</manifest>

View File

@ -13,7 +13,9 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
<activity
android:exported="true"
android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -22,4 +24,4 @@
</activity>
</application>
</manifest>
</manifest>

View File

@ -27,6 +27,7 @@
android:label="GeckoView Example"
android:launchMode="singleTop"
android:theme="@style/Theme.AppCompat.Light.NoActionBar"
android:exported="true"
android:windowSoftInputMode="stateUnspecified|adjustResize">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@ -52,11 +53,13 @@
android:name=".SessionActivity"
android:label="GeckoView Example"
android:theme="@style/Theme.AppCompat.Light.NoActionBar"
android:exported="false"
android:windowSoftInputMode="stateUnspecified|adjustResize">
</activity>
<activity
android:name=".SettingsActivity"
android:label="Settings"
android:exported="false"
android:theme="@style/Theme.AppCompat.Light.NoActionBar">
</activity>

View File

@ -20,7 +20,8 @@
android:name="androidx.multidex.MultiDexApplication">
<uses-library android:name="android.test.runner" android:required="false"/>
<activity android:name=".TestRunnerActivity" android:exported="true"/>
<activity-alias android:name=".App" android:targetActivity=".TestRunnerActivity">
<activity-alias android:name=".App" android:targetActivity=".TestRunnerActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<action android:name="org.mozilla.geckoview.test_runner.XPCSHELL_TEST"/>

View File

@ -1,3 +1,3 @@
platform-tools
build-tools;30.0.2
platforms;android-30
build-tools;31.0.0
platforms;android-31

View File

@ -88,8 +88,8 @@ def install_android_packages(logger, sdk_path, no_prompt=False):
raise OSError("Can't find sdkmanager at %s" % sdk_manager_path)
packages = ["platform-tools",
"build-tools;30.0.2",
"platforms;android-30",
"build-tools;31.0.0",
"platforms;android-31",
"emulator"]
# TODO: make this work non-internactively