diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2017-01-26 17:21:27 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-27 20:02:23 +0000 |
| commit | 6ccd2cabaac810edccab620d8a944f64b0432d44 (patch) | |
| tree | e25c0c088be285e6b990a5824c016c5a986cac70 /bench/nanobench.cpp | |
| parent | 91af72703830f3946c538b47c6c7c96afc0adde2 (diff) | |
Generate Android build targets for dm and nanobench
Generate targets for dm and nanobench from ninja and add them to the
generated Android.bp file.
Remove nanobenchAndroid and SkAndroidSDKCanvas. These rely on HWUI
internals and are currently unused.
Update gyp file references to removed files, just in case.
Change-Id: Ic6ae18a70bfd0c33804e7996d077f2081dfdfe07
Reviewed-on: https://skia-review.googlesource.com/7635
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'bench/nanobench.cpp')
| -rw-r--r-- | bench/nanobench.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 6aea7b5fbb..887fab3bad 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -53,10 +53,6 @@ #include <unistd.h> #endif -#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK - #include "nanobenchAndroid.h" -#endif - #if SK_SUPPORT_GPU #include "gl/GrGLDefines.h" #include "GrCaps.h" @@ -468,15 +464,6 @@ static void create_config(const SkCommandLineConfig* config, SkTArray<Config>* c } #undef CPU_CONFIG - -#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK - if (config->getTag().equals("hwui")) { - Config config = { SkString("hwui"), Benchmark::kHWUI_Backend, - kRGBA_8888_SkColorType, kPremul_SkAlphaType, nullptr, - 0, kBogusContextType, kBogusContextOptions, false }; - configs->push_back(config); - } -#endif } // Append all configs that are enabled and supported. @@ -511,11 +498,6 @@ static Target* is_enabled(Benchmark* bench, const Config& config) { target = new GPUTarget(config); break; #endif -#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK - case Benchmark::kHWUI_Backend: - target = new HWUITarget(config, bench); - break; -#endif default: target = new Target(config); break; |