diff options
| -rw-r--r-- | gn/BUILD.gn | 13 | ||||
| -rw-r--r-- | gn/BUILDCONFIG.gn | 3 | ||||
| -rw-r--r-- | infra/bots/gen_tasks.go | 3 | ||||
| -rw-r--r-- | infra/bots/tasks.json | 93 | ||||
| -rw-r--r-- | infra/config/recipes.cfg | 2 |
5 files changed, 109 insertions, 5 deletions
diff --git a/gn/BUILD.gn b/gn/BUILD.gn index 97e5368fdb..ec3a1f1ee3 100644 --- a/gn/BUILD.gn +++ b/gn/BUILD.gn @@ -186,18 +186,22 @@ config("default") { } if (is_ios) { + _target = target_cpu + if (target_cpu == "arm") { + _target = "armv7" + } cflags += [ "-isysroot", ios_sysroot, "-arch", - target_cpu, + _target, ] cflags_cc += [ "-stdlib=libc++" ] ldflags += [ "-isysroot", ios_sysroot, "-arch", - target_cpu, + _target, "-stdlib=libc++", ] libs += [ "objc" ] @@ -288,8 +292,9 @@ config("warnings") { "-Wno-unknown-warning-option", # Let older Clangs ignore newer Clangs' warnings. ] - if (is_android && target_cpu == "x86") { - # Clang seems to think new/malloc will only be 4-byte aligned on x86 Android. + if ((target_cpu == "x86" && is_android) || + (target_cpu == "arm" && is_ios)) { + # Clang seems to think new/malloc will only be 4-byte aligned on x86 Android and 32-bit iOS. # We're pretty sure it's actually 8-byte alignment. cflags += [ "-Wno-over-aligned" ] } diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn index 23e5288f1a..a89931b432 100644 --- a/gn/BUILDCONFIG.gn +++ b/gn/BUILDCONFIG.gn @@ -48,6 +48,9 @@ if (target_cpu == "") { target_cpu = "arm64" } } +if (target_cpu == "x86_64") { + target_cpu = "x64" +} if (current_cpu == "") { current_cpu = target_cpu } diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 89a6fe2860..5fc6a32fa6 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -40,8 +40,11 @@ var ( JOBS = []string{ "Build-Mac-Clang-Arm7-Debug-iOS", "Build-Mac-Clang-Arm7-Release-iOS", + "Build-Mac-Clang-arm-Debug-GN_iOS", + "Build-Mac-Clang-arm-Release-GN_iOS", "Build-Mac-Clang-arm64-Debug-Android", "Build-Mac-Clang-arm64-Debug-GN_iOS", + "Build-Mac-Clang-arm64-Release-GN_iOS", "Build-Mac-Clang-x86_64-Debug", "Build-Mac-Clang-x86_64-Debug-CommandBuffer", "Build-Mac-Clang-x86_64-Release", diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index e81a5d6cf8..39e6dc9449 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -12,6 +12,18 @@ "Build-Mac-Clang-Arm7-Release-iOS" ] }, + "Build-Mac-Clang-arm-Debug-GN_iOS": { + "priority": 0.8, + "tasks": [ + "Build-Mac-Clang-arm-Debug-GN_iOS" + ] + }, + "Build-Mac-Clang-arm-Release-GN_iOS": { + "priority": 0.8, + "tasks": [ + "Build-Mac-Clang-arm-Release-GN_iOS" + ] + }, "Build-Mac-Clang-arm64-Debug-Android": { "priority": 0.8, "tasks": [ @@ -24,6 +36,12 @@ "Build-Mac-Clang-arm64-Debug-GN_iOS" ] }, + "Build-Mac-Clang-arm64-Release-GN_iOS": { + "priority": 0.8, + "tasks": [ + "Build-Mac-Clang-arm64-Release-GN_iOS" + ] + }, "Build-Mac-Clang-x86_64-Debug": { "priority": 0.8, "tasks": [ @@ -1657,6 +1675,56 @@ "isolate": "compile_skia.isolate", "priority": 0.8 }, + "Build-Mac-Clang-arm-Debug-GN_iOS": { + "dimensions": [ + "gpu:none", + "os:Mac-10.11", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "swarm_compile", + "repository=<(REPO)", + "buildername=Build-Mac-Clang-arm-Debug-GN_iOS", + "mastername=fake-master", + "buildnumber=2", + "slavename=fake-buildslave", + "nobuildbot=True", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "isolate": "compile_skia.isolate", + "priority": 0.8 + }, + "Build-Mac-Clang-arm-Release-GN_iOS": { + "dimensions": [ + "gpu:none", + "os:Mac-10.11", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "swarm_compile", + "repository=<(REPO)", + "buildername=Build-Mac-Clang-arm-Release-GN_iOS", + "mastername=fake-master", + "buildnumber=2", + "slavename=fake-buildslave", + "nobuildbot=True", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "isolate": "compile_skia.isolate", + "priority": 0.8 + }, "Build-Mac-Clang-arm64-Debug-Android": { "cipd_packages": [ { @@ -1714,6 +1782,31 @@ "isolate": "compile_skia.isolate", "priority": 0.8 }, + "Build-Mac-Clang-arm64-Release-GN_iOS": { + "dimensions": [ + "gpu:none", + "os:Mac-10.11", + "pool:Skia" + ], + "extra_args": [ + "--workdir", + "../../..", + "swarm_compile", + "repository=<(REPO)", + "buildername=Build-Mac-Clang-arm64-Release-GN_iOS", + "mastername=fake-master", + "buildnumber=2", + "slavename=fake-buildslave", + "nobuildbot=True", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "isolate": "compile_skia.isolate", + "priority": 0.8 + }, "Build-Mac-Clang-x86_64-Debug": { "dimensions": [ "gpu:none", diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 20c852992a..b9289deecf 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -23,5 +23,5 @@ deps { project_id: "skia-recipes" url: "https://skia.googlesource.com/skia-recipes.git" branch: "master" - revision: "e2e91bd2def317153737460ec00b4266ff03e4ab" + revision: "471b831bb80d33fa1d5f98ec3801ad704ec93481" } |