stop testing jelly_bean

shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java

@@ -51,7 +51,7 @@
  * EmbeddedView
  */
 @Keep
-@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
+@TargetApi(Build.VERSION_CODES.KITKAT)
 class SingleViewPresentation extends Presentation {
  private static final String TAG = "PlatformViewsController";
 

shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java

@@ -485,7 +485,7 @@ public void itReleaseEngineWhenOnDestroy() {
  }
 
  @Test
- @Config(minSdk = Build.VERSION_CODES.JELLY_BEAN, maxSdk = Build.VERSION_CODES.P)
+ @Config(minSdk = Build.VERSION_CODES.KITKAT, maxSdk = Build.VERSION_CODES.P)
  public void fullyDrawn_beforeAndroidQ() {
  Intent intent = FlutterActivityWithReportFullyDrawn.createDefaultIntent(ctx);
  ActivityController<FlutterActivityWithReportFullyDrawn> activityController =

shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java

@@ -238,7 +238,7 @@ public void computePlatformResolvedLocale_fromAndroidN() {
  // Tests the legacy pre API 24 algorithm.
  @Test
  @Config(
- minSdk = Build.VERSION_CODES.JELLY_BEAN,
+ minSdk = Build.VERSION_CODES.KITKAT,
  maxSdk = Build.VERSION_CODES.M,
  qualifiers = "es-rMX")
  public void computePlatformResolvedLocale_emptySupportedLocales_beforeAndroidN() {
@@ -252,7 +252,7 @@ public void computePlatformResolvedLocale_emptySupportedLocales_beforeAndroidN()
  }
 
  @Test
- @Config(minSdk = Build.VERSION_CODES.JELLY_BEAN, maxSdk = Build.VERSION_CODES.M, qualifiers = "")
+ @Config(minSdk = Build.VERSION_CODES.KITKAT, maxSdk = Build.VERSION_CODES.M, qualifiers = "")
  public void computePlatformResolvedLocale_selectFirstLocaleWhenNoUserSetting_beforeAndroidN() {
  FlutterJNI flutterJNI = new FlutterJNI();
  DartExecutor dartExecutor = mock(DartExecutor.class);
@@ -273,7 +273,7 @@ public void computePlatformResolvedLocale_selectFirstLocaleWhenNoUserSetting_bef
 
  @Test
  @Config(
- minSdk = Build.VERSION_CODES.JELLY_BEAN,
+ minSdk = Build.VERSION_CODES.KITKAT,
  maxSdk = Build.VERSION_CODES.M,
  qualifiers = "fr-rCH")
  public void computePlatformResolvedLocale_selectFirstLocaleWhenNoExactMatch_beforeAndroidN() {
@@ -299,7 +299,7 @@ public void computePlatformResolvedLocale_selectFirstLocaleWhenNoExactMatch_befo
 
  @Test
  @Config(
- minSdk = Build.VERSION_CODES.JELLY_BEAN,
+ minSdk = Build.VERSION_CODES.KITKAT,
  maxSdk = Build.VERSION_CODES.M,
  qualifiers = "it-rIT")
  public void computePlatformResolvedLocale_selectExactMatchLocale_beforeAndroidN() {
@@ -325,7 +325,7 @@ public void computePlatformResolvedLocale_selectExactMatchLocale_beforeAndroidN(
 
  @Test
  @Config(
- minSdk = Build.VERSION_CODES.JELLY_BEAN,
+ minSdk = Build.VERSION_CODES.KITKAT,
  maxSdk = Build.VERSION_CODES.M,
  qualifiers = "fr-rCH")
  public void computePlatformResolvedLocale_selectOnlyLanguageLocale_beforeAndroidN() {

shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java

@@ -52,7 +52,7 @@
 public class PlatformPluginTest {
  private final Context ctx = ApplicationProvider.getApplicationContext();
 
- @Config(sdk = 16)
+ @Config(sdk = Build.VERSION_CODES.KITKAT)
  @Test
  public void itIgnoresNewHapticEventsOnOldAndroidPlatforms() {
  View fakeDecorView = mock(View.class);
@@ -70,7 +70,7 @@ public void itIgnoresNewHapticEventsOnOldAndroidPlatforms() {
  platformPlugin.vibrateHapticFeedback(PlatformChannel.HapticFeedbackType.SELECTION_CLICK);
  }
 
- @Config(sdk = 29)
+ @Config(sdk = Build.VERSION_CODES.Q)
  @Test
  public void platformPlugin_getClipboardData() throws IOException {
  ClipboardManager clipboardManager = ctx.getSystemService(ClipboardManager.class);
@@ -100,7 +100,7 @@ public void platformPlugin_getClipboardData() throws IOException {
 
  @SuppressWarnings("deprecation")
  // ClipboardManager.getText
- @Config(sdk = 28)
+ @Config(sdk = Build.VERSION_CODES.P)
  @Test
  public void platformPlugin_hasStrings() {
  ClipboardManager clipboardManager = spy(ctx.getSystemService(ClipboardManager.class));
@@ -154,7 +154,7 @@ public void platformPlugin_hasStrings() {
  verify(clipboardManager, never()).getText();
  }
 
- @Config(sdk = 29)
+ @Config(sdk = Build.VERSION_CODES.Q)
  @Test
  public void setNavigationBarDividerColor() {
  View fakeDecorView = mock(View.class);
@@ -229,7 +229,7 @@ public void setNavigationBarDividerColor() {
  }
  }
 
- @Config(sdk = 30)
+ @Config(sdk = Build.VERSION_CODES.R)
  @Test
  public void setNavigationBarIconBrightness() {
  if (Build.VERSION.SDK_INT >= 30) {
@@ -276,7 +276,7 @@ public void setNavigationBarIconBrightness() {
  }
  }
 
- @Config(sdk = 30)
+ @Config(sdk = Build.VERSION_CODES.R)
  @Test
  public void setStatusBarIconBrightness() {
  if (Build.VERSION.SDK_INT >= 30) {
@@ -323,7 +323,7 @@ public void setStatusBarIconBrightness() {
 
  @SuppressWarnings("deprecation")
  // SYSTEM_UI_FLAG_*, setSystemUiVisibility
- @Config(sdk = 29)
+ @Config(sdk = Build.VERSION_CODES.Q)
  @Test
  public void setSystemUiMode() {
  View fakeDecorView = mock(View.class);
@@ -440,7 +440,7 @@ public void setSystemUiModeListener_overlaysAreVisible() {
 
  @SuppressWarnings("deprecation")
  // SYSTEM_UI_FLAG_*, setSystemUiVisibility
- @Config(sdk = 28)
+ @Config(sdk = Build.VERSION_CODES.P)
  @Test
  public void doNotEnableEdgeToEdgeOnOlderSdk() {
  View fakeDecorView = mock(View.class);
@@ -462,7 +462,7 @@ public void doNotEnableEdgeToEdgeOnOlderSdk() {
 
  @SuppressWarnings("deprecation")
  // FLAG_TRANSLUCENT_STATUS, FLAG_TRANSLUCENT_NAVIGATION
- @Config(sdk = 29)
+ @Config(sdk = Build.VERSION_CODES.Q)
  @Test
  public void verifyWindowFlagsSetToStyleOverlays() {
  View fakeDecorView = mock(View.class);

shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java

@@ -4,7 +4,7 @@
 
 package io.flutter.plugin.platform;
 
-import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1;
+import static android.os.Build.VERSION_CODES.KITKAT;
 import static android.os.Build.VERSION_CODES.P;
 import static android.os.Build.VERSION_CODES.R;
 import static org.junit.Assert.assertEquals;
@@ -28,7 +28,7 @@
 @TargetApi(P)
 public class SingleViewPresentationTest {
  @Test
- @Config(minSdk = JELLY_BEAN_MR1, maxSdk = R)
+ @Config(minSdk = KITKAT, maxSdk = R)
  public void returnsOuterContextInputMethodManager() {
  // There's a bug in Android Q caused by the IMM being instanced per display.
  // https://github.com/flutter/flutter/issues/38375. We need the context returned by
@@ -59,7 +59,7 @@ public void returnsOuterContextInputMethodManager() {
  }
 
  @Test
- @Config(minSdk = JELLY_BEAN_MR1, maxSdk = R)
+ @Config(minSdk = KITKAT, maxSdk = R)
  public void returnsOuterContextInputMethodManager_createDisplayContext() {
  // The IMM should also persist across display contexts created from the base context.
 

tools/android_sdk/create_cipd_packages.sh

@@ -115,6 +115,13 @@ for platform in "${platforms[@]}"; do
  done
  done
 
+ # Special treatment for NDK to move to expected directory.
+ mv $upload_dir/sdk/ndk $upload_dir/ndk-bundle
+ ndk_sub_paths=`find $upload_dir/ndk-bundle -maxdepth 1 -type d`
+ ndk_sub_paths_arr=($ndk_sub_paths)
+ mv ${ndk_sub_paths_arr[1]} $upload_dir/ndk
+ rm -rf $upload_dir/ndk-bundle
+
  # Accept all licenses to ensure they are generated and uploaded.
  yes "y" | $sdkmanager_path --licenses --sdk_root=$sdk_root
  cp -r "$sdk_root/licenses" "$upload_dir/sdk"