From f167dfb272cf23c0618a6d674f4a375a2b29b27c Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Fri, 20 Jan 2017 19:24:10 -0500 Subject: [PATCH] mild tweaks to build_stages.py to run on my desktop Change-Id: Ie193e5bf576b8d3ddbd4c99d3707e3211557cc01 Reviewed-on: https://skia-review.googlesource.com/7368 Commit-Queue: Mike Klein Reviewed-by: Mike Klein --- src/splicer/build_stages.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/splicer/build_stages.py b/src/splicer/build_stages.py index f0cedf2..33f4dfe 100755 --- a/src/splicer/build_stages.py +++ b/src/splicer/build_stages.py @@ -9,6 +9,12 @@ import re import subprocess import sys +ndk = '/Users/mtklein/brew/opt/android-ndk/' +objdump = 'gobjdump' + +#ndk = '/home/mtklein/ndk/' +#objdump = '/home/mtklein/binutils-2.27/binutils/objdump' + cflags = '-std=c++11 -Os -fomit-frame-pointer'.split() hsw = '-mavx2 -mfma -mf16c'.split() @@ -21,8 +27,7 @@ subprocess.check_call(['clang++'] + cflags + hsw + aarch64 = [ '--target=aarch64-linux-android', - '--sysroot=' + - '/Users/mtklein/brew/opt/android-ndk/platforms/android-21/arch-arm64', + '--sysroot=' + ndk + 'platforms/android-21/arch-arm64', ] subprocess.check_call(['clang++'] + cflags + aarch64 + ['-c', 'src/splicer/SkSplicer_stages.cpp'] + @@ -33,8 +38,7 @@ subprocess.check_call(['clang++'] + cflags + aarch64 + armv7 = [ '--target=arm-linux-androideabi', - '--sysroot=' + - '/Users/mtklein/brew/opt/android-ndk/platforms/android-18/arch-arm', + '--sysroot=' + ndk + 'platforms/android-18/arch-arm', '-march=armv7-a', '-mfpu=neon-vfpv4', ] @@ -46,7 +50,7 @@ subprocess.check_call(['clang++'] + cflags + armv7 + ['-o', 'armv7_lowp.o']) def parse_object_file(dst, dot_o, array_type, done, target=None): - cmd = ['gobjdump', '-d', dot_o] + cmd = [ objdump, '-d', dot_o] if target: cmd += ['--target', target] for line in subprocess.check_output(cmd).split('\n'): -- 2.7.4