From e71dc3fd0d7e8a9ff8ffbb56c5c2a9daeed9df49 Mon Sep 17 00:00:00 2001 From: djsollen Date: Tue, 16 Feb 2016 09:19:35 -0800 Subject: [PATCH] Use a statically linked libhwui for testing. GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1688383005 Review URL: https://codereview.chromium.org/1688383005 --- gyp/dm.gyp | 5 +---- gyp/tests.gypi | 5 ----- platform_tools/android/gyp_gen/tool_makefile_writer.py | 2 ++ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/gyp/dm.gyp b/gyp/dm.gyp index 831cde7..a8a7fd7 100644 --- a/gyp/dm.gyp +++ b/gyp/dm.gyp @@ -16,10 +16,7 @@ ['skia_android_framework', { 'libraries': [ 'skia_static.a', - '-lhwui', - ], - 'include_dirs': [ - '../../../frameworks/base/libs/hwui/', + 'hwui_static.a', ], 'sources': [ '../dm/DMSrcSinkAndroid.cpp', diff --git a/gyp/tests.gypi b/gyp/tests.gypi index 09050ad..dfce3c0 100644 --- a/gyp/tests.gypi +++ b/gyp/tests.gypi @@ -32,11 +32,6 @@ [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "android"]', { 'sources!': [ '../tests/FontMgrAndroidParserTest.cpp', ], }], - [ 'skia_android_framework == 1', { - 'libraries': [ - '-ldl', - ], - }], [ 'not skia_pdf', { 'dependencies!': [ 'pdf.gyp:pdf', 'zlib.gyp:zlib' ], 'dependencies': [ 'pdf.gyp:nopdf' ], diff --git a/platform_tools/android/gyp_gen/tool_makefile_writer.py b/platform_tools/android/gyp_gen/tool_makefile_writer.py index 4c1174f..41326fb 100644 --- a/platform_tools/android/gyp_gen/tool_makefile_writer.py +++ b/platform_tools/android/gyp_gen/tool_makefile_writer.py @@ -42,6 +42,8 @@ def write_tool_android_mk(target_dir, var_dict): f.write(SKIA_RESOURCES) f.write('include $(LOCAL_PATH)/../skia_static_deps.mk\n') + if 'libhwui_static' in var_dict['LOCAL_STATIC_LIBRARIES']: + f.write('include frameworks/base/libs/hwui/hwui_static_deps.mk\n') f.write('include $(BUILD_NATIVE_TEST)\n') -- 2.7.4