Merge pull request #288 from WellingtonEspindula/master

pokowaka · web-flow · commit 0d5f55ca9388 · 2021-12-15T16:37:19.000-08:00
Add support to Android 12 (S) images
diff --git a/emu/emu_downloads_menu.py b/emu/emu_downloads_menu.py
@@ -55,6 +55,8 @@
     "28": "P",
     "29": "Q",
     "30": "R",
+    "31": "S",
+    "32": "S",
 }
 
 # Older versions might not work as expected.
diff --git a/emu/templates/Dockerfile.system_image b/emu/templates/Dockerfile.system_image
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied_
 # See the License for the specific language governing permissions and
 # limitations under the License_
-FROM alpine AS unzipper
+FROM alpine:3.3 AS unzipper
 RUN apk add --update unzip
 
 # Barely changes

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,8 @@`
`55`	`55`	`"28": "P",`
`56`	`56`	`"29": "Q",`
`57`	`57`	`"30": "R",`
	`58`	`+ "31": "S",`
	`59`	`+ "32": "S",`
`58`	`60`	`}`
`59`	`61`
`60`	`62`	`# Older versions might not work as expected.`