AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Generate makefile for bench_pictures.

Browse Source 
When generating Android framework makefiles, create one for
bench_pictures.

BUG=skia:2744
R=djsollen@google.com, halcanary@google.com, mtklein@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/391423002
This commit is contained in:
scroggo 2014-07-17 06:58:28 -07:00 committed by Commit bot
parent 805ef159d1
commit 3eb258d3f6
4 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gyp/tools.gyp
View File

@ -400,6 +400,11 @@
'tools.gyp:picture_renderer',
'tools.gyp:picture_utils',
],
'conditions': [
['skia_android_framework == 1', {
'libraries': [ '-lskia' ],
}],
],
},
{
'target_name': 'bench_record',

9
platform_tools/android/bin/gyp_to_android.py
View File

@ -149,6 +149,15 @@ def main(target_dir=None, require_sk_user_config=False):
local_module_tags=['tests'],
desired_targets=['bench'])
tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
target_file='tools.gyp',
skia_trunk=target_dir,
dest_dir='tools',
skia_lib_var_dict=common,
local_module_name='skia_bench_pictures',
local_module_tags=['tests'],
desired_targets=['bench_pictures'])
tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
target_file='gm.gyp',
skia_trunk=target_dir,

31
platform_tools/android/gyp_gen/makefile_writer.py
View File

@ -118,6 +118,7 @@ SKIA_TOOLS = (
# benchmark (timings)
include $(BASE_PATH)/bench/Android.mk
include $(BASE_PATH)/tools/Android.mk
# golden-master (fidelity / regression test)
include $(BASE_PATH)/gm/Android.mk
@ -149,28 +150,28 @@ class VarsDictData(object):
self.name = name
def write_local_path(f):
"""Add the LOCAL_PATH line to the makefile.
"""Add the LOCAL_PATH line to the makefile.
Args:
f: File open for writing.
"""
f.write('LOCAL_PATH:= $(call my-dir)\n')
Args:
f: File open for writing.
"""
f.write('LOCAL_PATH:= $(call my-dir)\n')
def write_clear_vars(f):
"""Add the CLEAR_VARS line to the makefile.
"""Add the CLEAR_VARS line to the makefile.
Args:
f: File open for writing.
"""
f.write('include $(CLEAR_VARS)\n')
Args:
f: File open for writing.
"""
f.write('include $(CLEAR_VARS)\n')
def write_include_stlport(f):
"""Add a line to include stlport.
"""Add a line to include stlport.
Args:
f: File open for writing.
"""
f.write('include external/stlport/libstlport.mk\n')
Args:
f: File open for writing.
"""
f.write('include external/stlport/libstlport.mk\n')
def write_android_mk(target_dir, common, deviations_from_common):
"""Given all the variables, write the final make file.

1
platform_tools/android/tests/expectations/Android.mk
View File

@ -151,6 +151,7 @@ include $(BUILD_SHARED_LIBRARY)
# benchmark (timings)
include $(BASE_PATH)/bench/Android.mk
include $(BASE_PATH)/tools/Android.mk
# golden-master (fidelity / regression test)
include $(BASE_PATH)/gm/Android.mk