Merge branch 'main' into release/v2

ychescale9 · ychescale9 · commit 94bd1ed921a3 · 2021-01-05T18:29:16.000+11:00
* main:
  Prepare for release 2.14.2.
  Support non-default API 28 images
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -36,6 +36,9 @@ jobs:
           - os: macos-latest
             api-level: 24
             target: playstore
+          - os: macos-latest
+            api-level: 28
+            target: google_apis
 
     steps:
     - name: checkout
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## v2.14.2
+
+* Support API 28 system images with `google_apis` or `google_apis_playstore` target - [#117](https://github.com/ReactiveCircus/android-emulator-runner/pull/117).
+
 ## v2.14.1
 
 * Fix hang during AVD creation when `profile` is not specified - [#113](https://github.com/ReactiveCircus/android-emulator-runner/issues/113).
diff --git a/lib/sdk-installer.js b/lib/sdk-installer.js
@@ -62,9 +62,9 @@ function installAndroidSdk(apiLevel, target, arch, emulatorBuild, ndkVersion, cm
         if (!isOnMac && !fs.existsSync(sdkPreviewLicensePath)) {
             fs.writeFileSync(sdkPreviewLicensePath, '\n84831b9409646a918e30573bab4c9c91346d8abd');
         }
-        // license required for API 30 system images
+        // license required for API 30 and non-default API 28 system images
         const sdkArmDbtLicensePath = `${process.env.ANDROID_SDK_ROOT}/licenses/android-sdk-arm-dbt-license`;
-        if (apiLevel == 30 && !fs.existsSync(sdkArmDbtLicensePath)) {
+        if (requiresArmDbtLicense(apiLevel, target) && !fs.existsSync(sdkArmDbtLicensePath)) {
             fs.writeFileSync(sdkArmDbtLicensePath, '\n859f317696f67ef3d7f30a50a5560e7834b43903');
         }
         console.log('Installing latest build tools, platform tools, and platform.');
@@ -93,3 +93,6 @@ function installAndroidSdk(apiLevel, target, arch, emulatorBuild, ndkVersion, cm
     });
 }
 exports.installAndroidSdk = installAndroidSdk;
+function requiresArmDbtLicense(apiLevel, target) {
+    return apiLevel === 30 || (apiLevel === 28 && target !== 'default');
+}
diff --git a/src/sdk-installer.ts b/src/sdk-installer.ts
@@ -36,9 +36,9 @@ export async function installAndroidSdk(apiLevel: number, target: string, arch:
     fs.writeFileSync(sdkPreviewLicensePath, '\n84831b9409646a918e30573bab4c9c91346d8abd');
   }
 
-  // license required for API 30 system images
+  // license required for API 30 and non-default API 28 system images
   const sdkArmDbtLicensePath = `${process.env.ANDROID_SDK_ROOT}/licenses/android-sdk-arm-dbt-license`;
-  if (apiLevel == 30 && !fs.existsSync(sdkArmDbtLicensePath)) {
+  if (requiresArmDbtLicense(apiLevel, target) && !fs.existsSync(sdkArmDbtLicensePath)) {
     fs.writeFileSync(sdkArmDbtLicensePath, '\n859f317696f67ef3d7f30a50a5560e7834b43903');
   }
 
@@ -67,3 +67,7 @@ export async function installAndroidSdk(apiLevel: number, target: string, arch:
     await exec.exec(`sh -c \\"sdkmanager --install 'cmake;${cmakeVersion}' > /dev/null"`);
   }
 }
+
+function requiresArmDbtLicense(apiLevel: number, target: string): boolean {
+  return apiLevel === 30 || (apiLevel === 28 && target !== 'default');
+}

Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,9 @@ function installAndroidSdk(apiLevel, target, arch, emulatorBuild, ndkVersion, cm`
`62`	`62`	`if (!isOnMac && !fs.existsSync(sdkPreviewLicensePath)) {`
`63`	`63`	`fs.writeFileSync(sdkPreviewLicensePath, '\n84831b9409646a918e30573bab4c9c91346d8abd');`
`64`	`64`	`}`
`65`		`- // license required for API 30 system images`
	`65`	`+ // license required for API 30 and non-default API 28 system images`
`66`	`66`	const sdkArmDbtLicensePath = `${process.env.ANDROID_SDK_ROOT}/licenses/android-sdk-arm-dbt-license`;
`67`		`- if (apiLevel == 30 && !fs.existsSync(sdkArmDbtLicensePath)) {`
	`67`	`+ if (requiresArmDbtLicense(apiLevel, target) && !fs.existsSync(sdkArmDbtLicensePath)) {`
`68`	`68`	`fs.writeFileSync(sdkArmDbtLicensePath, '\n859f317696f67ef3d7f30a50a5560e7834b43903');`
`69`	`69`	`}`
`70`	`70`	`console.log('Installing latest build tools, platform tools, and platform.');`
`@@ -93,3 +93,6 @@ function installAndroidSdk(apiLevel, target, arch, emulatorBuild, ndkVersion, cm`
`93`	`93`	`});`
`94`	`94`	`}`
`95`	`95`	`exports.installAndroidSdk = installAndroidSdk;`
	`96`	`+function requiresArmDbtLicense(apiLevel, target) {`
	`97`	`+ return apiLevel === 30 \|\| (apiLevel === 28 && target !== 'default');`
	`98`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,9 @@ export async function installAndroidSdk(apiLevel: number, target: string, arch:`
`36`	`36`	`fs.writeFileSync(sdkPreviewLicensePath, '\n84831b9409646a918e30573bab4c9c91346d8abd');`
`37`	`37`	`}`
`38`	`38`
`39`		`- // license required for API 30 system images`
	`39`	`+ // license required for API 30 and non-default API 28 system images`
`40`	`40`	const sdkArmDbtLicensePath = `${process.env.ANDROID_SDK_ROOT}/licenses/android-sdk-arm-dbt-license`;
`41`		`- if (apiLevel == 30 && !fs.existsSync(sdkArmDbtLicensePath)) {`
	`41`	`+ if (requiresArmDbtLicense(apiLevel, target) && !fs.existsSync(sdkArmDbtLicensePath)) {`
`42`	`42`	`fs.writeFileSync(sdkArmDbtLicensePath, '\n859f317696f67ef3d7f30a50a5560e7834b43903');`
`43`	`43`	`}`
`44`	`44`
`@@ -67,3 +67,7 @@ export async function installAndroidSdk(apiLevel: number, target: string, arch:`
`67`	`67`	await exec.exec(`sh -c \\"sdkmanager --install 'cmake;${cmakeVersion}' > /dev/null"`);
`68`	`68`	`}`
`69`	`69`	`}`
	`70`	`+`
	`71`	`+function requiresArmDbtLicense(apiLevel: number, target: string): boolean {`
	`72`	`+ return apiLevel === 30 \|\| (apiLevel === 28 && target !== 'default');`
	`73`	`+}`