From 5d3f7704bf9f3b4a075dc55b6951eec6f574c333 Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Thu, 1 Feb 2018 09:22:53 -0500 Subject: Add gn_to_bp script for SkQP. This refactors the current gn_to_bp script and moves the common components into a utils class. Both gn_to_bp scripts now also accept an optional param (--gn ) to make it easier to run within the Android tree where we don't have the DEPS synced. Change-Id: Idc4de7b3993e63e21a5b7137b1873d82a8e1843e Reviewed-on: https://skia-review.googlesource.com/102184 Commit-Queue: Derek Sollenberger Reviewed-by: Mike Klein --- gn/gn_to_bp.py | 109 ++++++++++++--------------------------------------------- 1 file changed, 22 insertions(+), 87 deletions(-) (limited to 'gn/gn_to_bp.py') diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py index 5b6b3c7021..3d5dcb6c94 100644 --- a/gn/gn_to_bp.py +++ b/gn/gn_to_bp.py @@ -14,6 +14,8 @@ import string import subprocess import tempfile +import gn_to_bp_utils + # First we start off with a template for Android.bp, # with holes for source lists and include directories. bp = string.Template('''// This file is autogenerated by gn_to_bp.py. @@ -213,12 +215,8 @@ gn_args = { 'target_os': '"android"', 'skia_vulkan_header': '"Skia_Vulkan_Android.h"', } -gn_args = ' '.join(sorted('%s=%s' % (k,v) for (k,v) in gn_args.iteritems())) - -tmp = tempfile.mkdtemp() -subprocess.check_call(['gn', 'gen', tmp, '--args=%s' % gn_args, '--ide=json']) -js = json.load(open(os.path.join(tmp, 'project.json'))) +js = gn_to_bp_utils.GenerateJSONFromGN(gn_args) def strip_slashes(lst): return {str(p.lstrip('/')) for p in lst} @@ -228,6 +226,7 @@ cflags = strip_slashes(js['targets']['//:skia']['cflags']) cflags_cc = strip_slashes(js['targets']['//:skia']['cflags_cc']) local_includes = strip_slashes(js['targets']['//:skia']['include_dirs']) export_includes = strip_slashes(js['targets']['//:public']['include_dirs']) +defines = [str(d) for d in js['targets']['//:skia']['defines']] dm_srcs = strip_slashes(js['targets']['//:dm']['sources']) dm_includes = strip_slashes(js['targets']['//:dm']['include_dirs']) @@ -236,81 +235,28 @@ nanobench_target = js['targets']['//:nanobench'] nanobench_srcs = strip_slashes(nanobench_target['sources']) nanobench_includes = strip_slashes(nanobench_target['include_dirs']) -def GrabDependentSrcs(name, srcs_to_extend, exclude): - # Grab the sources from other targets that $name depends on (e.g. optional - # Skia components, gms, tests, etc). - for dep in js['targets'][name]['deps']: - if 'third_party' in dep: - continue # We've handled all third-party DEPS as static or shared_libs. - if 'none' in dep: - continue # We'll handle all cpu-specific sources manually later. - if exclude and exclude in dep: - continue - srcs_to_extend.update(strip_slashes(js['targets'][dep].get('sources', []))) - GrabDependentSrcs(dep, srcs_to_extend, exclude) - -GrabDependentSrcs('//:skia', srcs, None) -GrabDependentSrcs('//:dm', dm_srcs, 'skia') -GrabDependentSrcs('//:nanobench', nanobench_srcs, 'skia') +gn_to_bp_utils.GrabDependentValues(js, '//:skia', 'sources', srcs, None) +gn_to_bp_utils.GrabDependentValues(js, '//:dm', 'sources', dm_srcs, 'skia') +gn_to_bp_utils.GrabDependentValues(js, '//:nanobench', 'sources', + nanobench_srcs, 'skia') # No need to list headers. srcs = {s for s in srcs if not s.endswith('.h')} dm_srcs = {s for s in dm_srcs if not s.endswith('.h')} nanobench_srcs = {s for s in nanobench_srcs if not s.endswith('.h')} -# Only use the generated flags related to warnings. -cflags = {s for s in cflags if s.startswith('-W')} -cflags_cc = {s for s in cflags_cc if s.startswith('-W')} -# Add the rest of the flags we want. -cflags = cflags.union([ - "-fvisibility=hidden", - "-D_FORTIFY_SOURCE=1", - "-DSKIA_DLL", - "-DSKIA_IMPLEMENTATION=1", - "-DATRACE_TAG=ATRACE_TAG_VIEW", - "-DSK_PRINT_CODEC_MESSAGES", -]) -cflags_cc.add("-fexceptions") - -# We need to undefine FORTIFY_SOURCE before we define it. Insert it at the -# beginning after sorting. -cflags = sorted(cflags) -cflags.insert(0, "-U_FORTIFY_SOURCE") +cflags = gn_to_bp_utils.CleanupCFlags(cflags) +cflags_cc = gn_to_bp_utils.CleanupCCFlags(cflags_cc) # We need to add the include path to the vulkan defines and header file set in # then skia_vulkan_header gn arg that is used for framework builds. local_includes.add("platform_tools/android/vulkan") export_includes.add("platform_tools/android/vulkan") -# Most defines go into SkUserConfig.h, where they're seen by Skia and its users. -defines = [str(d) for d in js['targets']['//:skia']['defines']] -defines.remove('NDEBUG') # Let the Android build control this. -defines.remove('SKIA_IMPLEMENTATION=1') # Only libskia should have this define. - -# For architecture specific files, it's easier to just read the same source -# that GN does (opts.gni) rather than re-run GN once for each architecture. - -# This .gni file we want to read is close enough to Python syntax -# that we can use execfile() if we supply definitions for GN builtins. - -def get_path_info(path, kind): - assert kind == "abspath" - # While we want absolute paths in GN, relative paths work best here. - return path - -builtins = { 'get_path_info': get_path_info } -defs = {} here = os.path.dirname(__file__) -execfile(os.path.join(here, 'opts.gni'), builtins, defs) +defs = gn_to_bp_utils.GetArchSources(os.path.join(here, 'opts.gni')) -# Turn paths from opts.gni into paths relative to external/skia. -def scrub(lst): - # Perform any string substitutions. - for var in defs: - if type(defs[var]) is str: - lst = [ p.replace('$'+var, defs[var]) for p in lst ] - # Relativize paths to top-level skia/ directory. - return [os.path.relpath(p, '..') for p in lst] +gn_to_bp_utils.WriteUserConfig('include/config/SkUserConfig.h', defines) # Turn a list of strings into the style bpfmt outputs. def bpfmt(indent, lst, sort=True): @@ -327,16 +273,16 @@ with open('Android.bp', 'w') as f: 'cflags': bpfmt(8, cflags, False), 'cflags_cc': bpfmt(8, cflags_cc), - 'arm_srcs': bpfmt(16, scrub(defs['armv7'])), - 'arm_neon_srcs': bpfmt(20, scrub(defs['neon'])), - 'arm64_srcs': bpfmt(16, scrub(defs['arm64'] + - defs['crc32'])), - 'none_srcs': bpfmt(16, scrub(defs['none'])), - 'x86_srcs': bpfmt(16, scrub(defs['sse2'] + - defs['ssse3'] + - defs['sse41'] + - defs['sse42'] + - defs['avx' ])), + 'arm_srcs': bpfmt(16, defs['armv7']), + 'arm_neon_srcs': bpfmt(20, defs['neon']), + 'arm64_srcs': bpfmt(16, defs['arm64'] + + defs['crc32']), + 'none_srcs': bpfmt(16, defs['none']), + 'x86_srcs': bpfmt(16, defs['sse2'] + + defs['ssse3'] + + defs['sse41'] + + defs['sse42'] + + defs['avx' ]), 'dm_includes' : bpfmt(8, dm_includes), 'dm_srcs' : bpfmt(8, dm_srcs), @@ -344,14 +290,3 @@ with open('Android.bp', 'w') as f: 'nanobench_includes' : bpfmt(8, nanobench_includes), 'nanobench_srcs' : bpfmt(8, nanobench_srcs), }) - -#... and all the #defines we want to put in SkUserConfig.h. -with open('include/config/SkUserConfig.h', 'w') as f: - print >>f, '// DO NOT MODIFY! This file is autogenerated by gn_to_bp.py.' - print >>f, '// If need to change a define, modify SkUserConfigManual.h' - print >>f, '#ifndef SkUserConfig_DEFINED' - print >>f, '#define SkUserConfig_DEFINED' - print >>f, '#include "SkUserConfigManual.h"' - for define in sorted(defines): - print >>f, ' #define', define.replace('=', ' ') - print >>f, '#endif//SkUserConfig_DEFINED' -- cgit v1.2.3