commit b5cdf6dd8cd09223122ebaa6694c25c0871f4921
author Logan Chien <loganchien@google.com> Sat Jul 13 14:22:32 2019 -0700
committer android-build-merger <android-build-merger@google.com> Sat Jul 13 14:22:32 2019 -0700
tree e35a2d136d3ab5035e144277fee2d968f499e5dc
parent 8c2d5f18bb25fc3366b351a73e39a739ea6ff42e
parent 737930417c56d76e9a55f6ef620f16b6b0c99b93

Merge changes Ia0410da8,Id756340f am: 1277b8cca1 am: 014de67d06
am: 737930417c

Change-Id: Ia086b7302a1921ef5117b9505f1b051d810a36d7

tools/extract_kernel.py

diff --git a/tools/extract_kernel.py b/tools/extract_kernel.py
index 16ccb22..42561cf 100755
--- a/tools/extract_kernel.py
+++ b/tools/extract_kernel.py
@@ -47,7 +47,10 @@
   null_idx = input_bytes.find('\x00', start_idx)
   if null_idx < 0:
     return None
-  linux_banner = input_bytes[start_idx:null_idx].decode()
+  try:
+    linux_banner = input_bytes[start_idx:null_idx].decode()
+  except UnicodeDecodeError:
+    return None
   mo = re.match(LINUX_BANNER_REGEX, linux_banner)
   if mo:
     return mo.group(1)

tools/releasetools/sign_target_files_apks.py

diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py
index 4cb3a37..4802fc6 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -1007,6 +1007,10 @@
     codename = codename.strip()
     if codename:
       result[codename] = api_level
+
+  # Work around APKs that still target 'Q' instead of API 29 (b/132882632).
+  result['Q'] = 29
+
   return result