aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@chromium.org>2017-01-20 19:24:10 -0500
committerGravatar Mike Klein <mtklein@chromium.org>2017-01-21 15:11:17 +0000
commitf167dfb272cf23c0618a6d674f4a375a2b29b27c (patch)
treea18d23df87afae52810c75dd1f28d72341e23c58
parentefaad3cd53330f063e6feaee8b14ad43ca251184 (diff)
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 <mtklein@chromium.org> Reviewed-by: Mike Klein <mtklein@chromium.org>
-rwxr-xr-xsrc/splicer/build_stages.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/splicer/build_stages.py b/src/splicer/build_stages.py
index f0cedf26ce..33f4dfe40e 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'):