diff options
| author |  Mike Klein <mtklein@chromium.org> | 2018-01-29 18:38:16 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-30 00:05:11 +0000 |
| commit | ecd251bbd28dbf52e465aef47f7062f2bb51e43a (patch) | |
| tree | f5b3cb51f45805875215b61be3614837ceac3f89 /infra | |
| parent | 7df27465c4ecc8a4a0cdd95e9785c342903c2de9 (diff) | |
target Android M for -arm- ASAN builds
Change-Id: I8154b9a0b2fcf76fa02af0efa6b57425c6f9ac31
Reviewed-on: https://skia-review.googlesource.com/101580
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'infra')
3 files changed, 59 insertions, 3 deletions
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json new file mode 100644 index 0000000000..4ec3463d65 --- /dev/null +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-arm-Release-Android_ASAN.json @@ -0,0 +1,56 @@ +[ + { + "cmd": [ + "python", + "-u", + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN" + }, + "infra_step": true, + "name": "fetch-gn" + }, + { + "cmd": [ + "[CUSTOM_/_B_WORK]/skia/bin/gn", + "gen", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN/Release", + "--args=is_debug=false ndk=\"[START_DIR]/android_ndk_linux\" ndk_api=21 sanitize=\"ASAN\" target_cpu=\"arm\"" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN" + }, + "name": "gn gen" + }, + { + "cmd": [ + "ninja", + "-k", + "0", + "-C", + "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN/Release" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm-Release-Android_ASAN" + }, + "name": "ninja" + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/flavor/examples/full.py b/infra/bots/recipe_modules/flavor/examples/full.py index 0237ba9e9a..e42ed13e11 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.py +++ b/infra/bots/recipe_modules/flavor/examples/full.py @@ -59,6 +59,7 @@ def RunSteps(api): TEST_BUILDERS = [ 'Build-Debian9-Clang-arm-Release-Android_API26', 'Build-Debian9-Clang-arm-Release-Chromebook_GLES', + 'Build-Debian9-Clang-arm-Release-Android_ASAN', 'Build-Debian9-Clang-arm64-Release-Android_ASAN', 'Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES', 'Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE', diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py index a919ea0a51..c5c3bbd4b0 100644 --- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py @@ -374,10 +374,9 @@ if actual_freq != str(freq): args['ndk_api'] = 24 args['skia_enable_vulkan_debug_layers'] = 'false' if 'ASAN' in extra_tokens: - # Note: if one day we do ASAN on 32 bit arm, we need to - # make sure we use at least SDK 21 - # args['ndk_api'] = 21 args['sanitize'] = '"ASAN"' + if target_arch == 'arm' and 'ndk_api' not in args: + args['ndk_api'] = 21 # If an Android API level is specified, use that. for t in extra_tokens: |