infra: Add configs for Android build.

.gn

@@ -42,4 +42,8 @@ default_args = {
 
   # Disable location tags in isolates.
   tests_have_location_tags = false
+
+  # Use base level API level 29 support for AHardwareBuffer ANGLE tests.
+  android32_ndk_api_level = 29
+  android64_ndk_api_level = 29
 }

infra/config/generated/luci-milo.cfg

@@ -11,6 +11,26 @@ consoles {
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
   builders {
+    name: "buildbucket/luci.angle.ci/android-arm-dbg"
+    category: "angle|android|clang|arm"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.angle.ci/android-arm-rel"
+    category: "angle|android|clang|arm"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.angle.ci/android-arm64-dbg"
+    category: "angle|android|clang|arm64"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.angle.ci/android-arm64-rel"
+    category: "angle|android|clang|arm64"
+    short_name: "rel"
+  }
+  builders {
     name: "buildbucket/luci.angle.ci/linux-clang-dbg"
     category: "angle|linux|clang|x64"
     short_name: "dbg"
@@ -105,6 +125,18 @@ consoles {
   id: "try"
   name: "ANGLE Try Builders"
   builders {
+    name: "buildbucket/luci.angle.try/android-arm-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.angle.try/android-arm-rel"
+  }
+  builders {
+    name: "buildbucket/luci.angle.try/android-arm64-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.angle.try/android-arm64-rel"
+  }
+  builders {
     name: "buildbucket/luci.angle.try/linux-clang-dbg"
   }
   builders {

infra/config/generated/luci-scheduler.cfg

@@ -5,6 +5,42 @@
 #   https://luci-config.appspot.com/schemas/projects:luci-scheduler.cfg
 
 job {
+  id: "android-arm-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.angle.ci"
+    builder: "android-arm-dbg"
+  }
+}
+job {
+  id: "android-arm-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.angle.ci"
+    builder: "android-arm-rel"
+  }
+}
+job {
+  id: "android-arm64-dbg"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.angle.ci"
+    builder: "android-arm64-dbg"
+  }
+}
+job {
+  id: "android-arm64-rel"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.angle.ci"
+    builder: "android-arm64-rel"
+  }
+}
+job {
   id: "linux-clang-dbg"
   acl_sets: "ci"
   buildbucket {
@@ -170,6 +206,10 @@ trigger {
   id: "master-poller"
   schedule: "with 10s interval"
   acl_sets: "ci"
+  triggers: "android-arm-dbg"
+  triggers: "android-arm-rel"
+  triggers: "android-arm64-dbg"
+  triggers: "android-arm64-rel"
   triggers: "linux-clang-dbg"
   triggers: "linux-clang-rel"
   triggers: "linux-gcc-dbg"

infra/config/main.star

@@ -52,6 +52,7 @@ luci.logdog(gs_bucket = "chromium-luci-logdog")
 # The category for an os: a more generic grouping than specific OS versions that
 # can be used for computing defaults
 os_category = struct(
+    ANDROID = "Android",
     LINUX = "Linux",
     MAC = "Mac",
     WINDOWS = "Windows",
@@ -61,6 +62,7 @@ def os_enum(dimension, category, console_name):
     return struct(dimension = dimension, category = category, console_name = console_name)
 
 os = struct(
+    ANDROID = os_enum("Ubuntu", os_category.ANDROID, "android"),
     LINUX = os_enum("Ubuntu", os_category.LINUX, "linux"),
     MAC = os_enum("Mac", os_category.MAC, "mac"),
     WINDOWS = os_enum("Windows", os_category.WINDOWS, "win"),
@@ -107,6 +109,8 @@ build_recipe(
 )
 
 def get_os_from_name(name):
+    if name.startswith("android"):
+        return os.ANDROID
     if name.startswith("linux"):
         return os.LINUX
     if name.startswith("win"):
@@ -116,28 +120,33 @@ def get_os_from_name(name):
     return os.MAC
 
 # Adds both the CI and Try standalone builders.
-def angle_standalone_builder(name, clang, debug, cpu, uwp = False, trace_tests = False):
+def angle_standalone_builder(name, debug, cpu, toolchain = "clang", uwp = False, trace_tests = False):
     properties = {
         "builder_group": "angle",
     }
-    os = get_os_from_name(name)
+    config_os = get_os_from_name(name)
     dimensions = {}
-    dimensions["os"] = os.dimension
+    dimensions["os"] = config_os.dimension
 
     goma_props = {}
     goma_props.update(_GOMA_RBE_PROD)
 
-    if os.category in _DEFAULT_BUILDERLESS_OS_CATEGORIES:
+    if config_os.category in _DEFAULT_BUILDERLESS_OS_CATEGORIES:
         dimensions["builderless"] = "1"
         goma_props["enable_ats"] = True
 
     properties["$build/goma"] = goma_props
-
-    if not clang:
-        properties["clang"] = False
+    properties["platform"] = config_os.console_name
+    properties["toolchain"] = toolchain
 
     if trace_tests:
-        properties["trace_tests"] = True
+        properties["test_mode"] = "trace_tests"
+    elif toolchain == "gcc":
+        properties["test_mode"] = "checkout_only"
+    elif debug:
+        properties["test_mode"] = "compile_only"
+    else:
+        properties["test_mode"] = "compile_and_test"
 
     luci.builder(
         name = name,
@@ -171,24 +180,17 @@ def angle_standalone_builder(name, clang, debug, cpu, uwp = False, trace_tests =
         config = "angle"
         location_regexp = None
 
-    if clang:
-        compiler = "clang"
-    elif os.category == os_category.WINDOWS:
-        compiler = "msvc"
-    else:
-        compiler = "gcc"
-
     if uwp:
-        os = "winuwp"
+        os_name = "winuwp"
     else:
-        os = os.console_name
+        os_name = config_os.console_name
 
     short_name = "dbg" if debug else "rel"
 
     luci.console_view_entry(
         console_view = "ci",
         builder = "ci/" + name,
-        category = config + "|" + os + "|" + compiler + "|" + cpu,
+        category = config + "|" + os_name + "|" + toolchain + "|" + cpu,
         short_name = short_name,
     )
 
@@ -197,8 +199,9 @@ def angle_standalone_builder(name, clang, debug, cpu, uwp = False, trace_tests =
         builder = "try/" + name,
     )
 
-    # Include all bots in the CQ by default except GCC configs.
-    if compiler != "gcc":
+    # Include all bots in the CQ by default except GCC and Android configs.
+    # TODO(jmadill): Add Android to CQ by default. http://anglebug.com/2344
+    if toolchain != "gcc" and config_os.category != os_category.ANDROID:
         luci.cq_tryjob_verifier(
             cq_group = 'master',
             builder = "angle:try/" + name,
@@ -258,24 +261,28 @@ luci.gitiles_poller(
 )
 
 # name, clang, debug, cpu, uwp, trace_tests
-angle_standalone_builder("linux-clang-dbg", clang = True, debug = True, cpu = "x64")
-angle_standalone_builder("linux-clang-rel", clang = True, debug = False, cpu = "x64")
-angle_standalone_builder("linux-gcc-dbg", clang = False, debug = True, cpu = "x64")
-angle_standalone_builder("linux-gcc-rel", clang = False, debug = False, cpu = "x64")
-angle_standalone_builder("linux-trace-rel", clang = True, debug = False, cpu = "x64", trace_tests = True)
-angle_standalone_builder("mac-dbg", clang = True, debug = True, cpu = "x64")
-angle_standalone_builder("mac-rel", clang = True, debug = False, cpu = "x64")
-angle_standalone_builder("win-clang-x86-dbg", clang = True, debug = True, cpu = "x86")
-angle_standalone_builder("win-clang-x86-rel", clang = True, debug = False, cpu = "x86")
-angle_standalone_builder("win-clang-x64-dbg", clang = True, debug = True, cpu = "x64")
-angle_standalone_builder("win-clang-x64-rel", clang = True, debug = False, cpu = "x64")
-angle_standalone_builder("win-msvc-x86-dbg", clang = False, debug = True, cpu = "x86")
-angle_standalone_builder("win-msvc-x86-rel", clang = False, debug = False, cpu = "x86")
-angle_standalone_builder("win-msvc-x64-dbg", clang = False, debug = True, cpu = "x64")
-angle_standalone_builder("win-msvc-x64-rel", clang = False, debug = False, cpu = "x64")
-angle_standalone_builder("win-trace-rel", clang = True, debug = False, cpu = "x64", trace_tests = True)
-angle_standalone_builder("winuwp-x64-dbg", clang = False, debug = True, cpu = "x64", uwp = True)
-angle_standalone_builder("winuwp-x64-rel", clang = False, debug = False, cpu = "x64", uwp = True)
+angle_standalone_builder("android-arm-dbg", debug = True, cpu = "arm")
+angle_standalone_builder("android-arm-rel", debug = False, cpu = "arm")
+angle_standalone_builder("android-arm64-dbg", debug = True, cpu = "arm64")
+angle_standalone_builder("android-arm64-rel", debug = False, cpu = "arm64")
+angle_standalone_builder("linux-clang-dbg", debug = True, cpu = "x64")
+angle_standalone_builder("linux-clang-rel", debug = False, cpu = "x64")
+angle_standalone_builder("linux-gcc-dbg", debug = True, cpu = "x64", toolchain = "gcc")
+angle_standalone_builder("linux-gcc-rel", debug = False, cpu = "x64", toolchain = "gcc")
+angle_standalone_builder("linux-trace-rel", debug = False, cpu = "x64", trace_tests = True)
+angle_standalone_builder("mac-dbg", debug = True, cpu = "x64")
+angle_standalone_builder("mac-rel", debug = False, cpu = "x64")
+angle_standalone_builder("win-clang-x86-dbg", debug = True, cpu = "x86")
+angle_standalone_builder("win-clang-x86-rel", debug = False, cpu = "x86")
+angle_standalone_builder("win-clang-x64-dbg", debug = True, cpu = "x64")
+angle_standalone_builder("win-clang-x64-rel", debug = False, cpu = "x64")
+angle_standalone_builder("win-msvc-x86-dbg", debug = True, cpu = "x86", toolchain = "msvc")
+angle_standalone_builder("win-msvc-x86-rel", debug = False, cpu = "x86", toolchain = "msvc")
+angle_standalone_builder("win-msvc-x64-dbg", debug = True, cpu = "x64", toolchain = "msvc")
+angle_standalone_builder("win-msvc-x64-rel", debug = False, cpu = "x64", toolchain = "msvc")
+angle_standalone_builder("win-trace-rel", debug = False, cpu = "x64", trace_tests = True)
+angle_standalone_builder("winuwp-x64-dbg", debug = True, cpu = "x64", toolchain = "msvc", uwp = True)
+angle_standalone_builder("winuwp-x64-rel", debug = False, cpu = "x64", toolchain = "msvc", uwp = True)
 
 # Views
 

infra/specs/angle_mb_config.pyl

@@ -14,6 +14,10 @@
   # this dict to look up which config to use for a given bot.
   'builder_groups': {
     'angle': {
+      'android-arm-dbg': 'angle_goma_android_arm_debug_bot',
+      'android-arm-rel': 'angle_goma_android_arm_release_bot',
+      'android-arm64-dbg': 'angle_goma_android_arm64_debug_bot',
+      'android-arm64-rel': 'angle_goma_android_arm64_release_bot',
       'linux-clang-dbg': 'angle_goma_debug_bot',
       'linux-clang-rel': 'angle_goma_release_bot',
       'linux-gcc-dbg': 'angle_non_clang_debug_bot',
@@ -39,6 +43,10 @@
   # is not necessarily so (i.e., we might have mac, win, and linux
   # bots all using the 'release_bot' config).
   'configs': {
+    'angle_goma_android_arm_debug_bot': ['angle', 'goma', 'android', 'arm', 'debug'],
+    'angle_goma_android_arm_release_bot': ['angle', 'goma', 'android', 'arm', 'release'],
+    'angle_goma_android_arm64_debug_bot': ['angle', 'goma', 'android', 'arm64', 'debug'],
+    'angle_goma_android_arm64_release_bot': ['angle', 'goma', 'android', 'arm64', 'release'],
     'angle_goma_debug_bot': ['angle', 'goma', 'debug'],
     'angle_goma_release_bot': ['angle', 'goma', 'release'],
     'angle_goma_x86_debug_bot': ['angle', 'goma', 'x86', 'debug'],
@@ -54,26 +62,35 @@
   # This is a dict mapping a given 'mixin' name to a dict of settings that
   # mb should use. See //tools/mb/docs/user_guide.md for more information.
   'mixins': {
+    'android': {
+      'gn_args': 'target_os="android"',
+    },
     'angle': {
-      'gn_args': 'build_angle_gles1_conform_tests=true build_angle_trace_perf_tests=true is_component_build=false'
+      'gn_args': 'build_angle_gles1_conform_tests=true build_angle_trace_perf_tests=true is_component_build=false',
+    },
+    'arm': {
+      'gn_args': 'target_cpu="arm"',
+    },
+    'arm64': {
+      'gn_args': 'target_cpu="arm64"',
     },
     'debug': {
       'gn_args': 'is_debug=true',
     },
     'goma': {
-      'gn_args': 'use_goma=true'
+      'gn_args': 'use_goma=true',
     },
     'non_clang': {
-      'gn_args': 'is_clang=false'
+      'gn_args': 'is_clang=false',
     },
     'release': {
-      'gn_args': 'is_debug=false'
+      'gn_args': 'is_debug=false',
     },
     'winuwp': {
-      'gn_args': 'target_os="winuwp"'
+      'gn_args': 'target_os="winuwp"',
     },
     'x86': {
-      'gn_args': 'target_cpu="x86"'
+      'gn_args': 'target_cpu="x86"',
     },
   },
 }