Add new Android builder which uses API_LEVEL 26
Bug: skia:6870
Change-Id: Idd9a27518c1123c0a729b4d07461047f5530aae3
Reviewed-on: https://skia-review.googlesource.com/24960
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py
index 4dd1093..c0cf748 100644
--- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py
@@ -5,6 +5,7 @@
from recipe_engine import recipe_api
import default_flavor
+import re
import subprocess
@@ -69,6 +70,12 @@
if 'Vulkan' in extra_config:
args['ndk_api'] = 24
args['skia_enable_vulkan_debug_layers'] = 'false'
+
+ # If an Android API level is specified, use that.
+ m = re.search(r'API(\d+)', extra_config)
+ if m and len(m.groups()) == 1:
+ args['ndk_api'] = m.groups()[0]
+
if extra_cflags:
args['extra_cflags'] = repr(extra_cflags).replace("'", '"')