diff options
| author |  djsollen <djsollen@google.com> | 2015-12-18 09:34:08 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-18 09:34:08 -0800 |
| commit | 14d8fa0f58bf7f814901d2ae068af8814d6ed1a4 (patch) | |
| tree | 571c75c85240a91b8dfc0d129b7af6438edc4862 | |
| parent | 1e810b3cc290b5b5d95c7789661271256288977c (diff) | |
Move SkAndroidSDKCanvas to tools and ensure that it is built on all Android builds
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1536013003
Review URL: https://codereview.chromium.org/1536013003
| -rw-r--r-- | gyp/bench.gyp | 2 | ||||
| -rw-r--r-- | gyp/dm.gyp | 2 | ||||
| -rw-r--r-- | gyp/tools.gyp | 25 | ||||
| -rw-r--r-- | gyp/utils.gyp | 18 | ||||
| -rw-r--r-- | tools/android/SkAndroidSDKCanvas.cpp (renamed from src/utils/android/SkAndroidSDKCanvas.cpp) | 0 | ||||
| -rw-r--r-- | tools/android/SkAndroidSDKCanvas.h (renamed from src/utils/android/SkAndroidSDKCanvas.h) | 0 |
6 files changed, 27 insertions, 20 deletions
diff --git a/gyp/bench.gyp b/gyp/bench.gyp index c7a03b8d04..7b84ab9d37 100644 --- a/gyp/bench.gyp +++ b/gyp/bench.gyp @@ -39,7 +39,7 @@ '../../../frameworks/base/libs/hwui/', ], 'dependencies': [ - 'utils.gyp:android_utils', + 'tools.gyp:android_utils', ], }], ], diff --git a/gyp/dm.gyp b/gyp/dm.gyp index 2a4c1c2c43..a05d079b8c 100644 --- a/gyp/dm.gyp +++ b/gyp/dm.gyp @@ -27,7 +27,7 @@ '../dm/DMSrcSinkAndroid.cpp', ], 'dependencies': [ - 'utils.gyp:android_utils', + 'tools.gyp:android_utils', ], }], ], diff --git a/gyp/tools.gyp b/gyp/tools.gyp index 590ac3b175..1e7eabbecf 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -42,7 +42,32 @@ ], }, ], + [ 'skia_os == "android"', + { + 'dependencies': [ + # Build this by default to catch compile errors more quickly, since + # the only other time this code is exercised in the android framework + 'android_utils', + ], + }, + ], + ], + }, + { + 'target_name': 'android_utils', + 'type': 'static_library', + 'dependencies': [ + 'core.gyp:core', + ], + 'sources': [ + '../tools/android/SkAndroidSDKCanvas.h', + '../tools/android/SkAndroidSDKCanvas.cpp', ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../tools/android', + ], + }, }, { 'target_name': 'dump_record', diff --git a/gyp/utils.gyp b/gyp/utils.gyp index 39486deb56..eb225e62a2 100644 --- a/gyp/utils.gyp +++ b/gyp/utils.gyp @@ -105,23 +105,5 @@ ], }, }, - { - 'target_name': 'android_utils', - 'product_name': 'skia_android_utils', - 'type': 'static_library', - 'standalone_static_library': 1, - 'dependencies': [ - 'core.gyp:*', - ], - 'sources': [ - '../src/utils/android/SkAndroidSDKCanvas.h', - '../src/utils/android/SkAndroidSDKCanvas.cpp', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../src/utils/android', - ], - }, - }, ], } diff --git a/src/utils/android/SkAndroidSDKCanvas.cpp b/tools/android/SkAndroidSDKCanvas.cpp index 45fcc758f2..45fcc758f2 100644 --- a/src/utils/android/SkAndroidSDKCanvas.cpp +++ b/tools/android/SkAndroidSDKCanvas.cpp diff --git a/src/utils/android/SkAndroidSDKCanvas.h b/tools/android/SkAndroidSDKCanvas.h index d8ee0ed216..d8ee0ed216 100644 --- a/src/utils/android/SkAndroidSDKCanvas.h +++ b/tools/android/SkAndroidSDKCanvas.h |