Zhizhou Yang | 2eebfdf | 2018-02-07 18:14:44 -0800 | [diff] [blame] | 1 | # TO CLARIFY: |
| 2 | # This patch will remove the attempt to copy resources to device, |
| 3 | # because there is a bug (http://b/71906438) forbiding copying subdirectory. |
| 4 | # Since we are using mma to build and copy resources manually to device, |
| 5 | # at this moment we remove this part to work around with the bug. |
| 6 | |
Zhizhou Yang | e598690 | 2017-08-10 17:37:53 -0700 | [diff] [blame] | 7 | diff --git a/Android.bp b/Android.bp |
Zhizhou Yang | 2eebfdf | 2018-02-07 18:14:44 -0800 | [diff] [blame] | 8 | index 9b7dd9b4a2..3bf20bd38c 100644 |
Zhizhou Yang | e598690 | 2017-08-10 17:37:53 -0700 | [diff] [blame] | 9 | --- a/Android.bp |
| 10 | +++ b/Android.bp |
Zhizhou Yang | 645c664 | 2017-12-13 18:01:43 -0800 | [diff] [blame] | 11 | @@ -58,8 +58,11 @@ cc_library_static { |
| 12 | "-Wsign-compare", |
| 13 | "-Wvla", |
| 14 | "-fvisibility=hidden", |
Zhizhou Yang | f29a55f | 2017-09-11 11:00:59 -0700 | [diff] [blame] | 15 | + CFLAGS_FOR_BENCH_SUITE |
Zhizhou Yang | e598690 | 2017-08-10 17:37:53 -0700 | [diff] [blame] | 16 | ], |
Zhizhou Yang | 645c664 | 2017-12-13 18:01:43 -0800 | [diff] [blame] | 17 | |
Zhizhou Yang | 2eebfdf | 2018-02-07 18:14:44 -0800 | [diff] [blame] | 18 | + ldflags: [LDFLAGS_FOR_BENCH_SUITE], |
Zhizhou Yang | 645c664 | 2017-12-13 18:01:43 -0800 | [diff] [blame] | 19 | + |
| 20 | cppflags:[ |
| 21 | "-Wno-abstract-vbase-init", |
| 22 | "-Wno-c++98-compat", |
Zhizhou Yang | 2eebfdf | 2018-02-07 18:14:44 -0800 | [diff] [blame] | 23 | @@ -985,6 +988,9 @@ cc_test { |
Zhizhou Yang | 645c664 | 2017-12-13 18:01:43 -0800 | [diff] [blame] | 24 | "skia_tool_deps" |
| 25 | ], |
| 26 | |
| 27 | + cflags: [CFLAGS_FOR_BENCH_SUITE], |
Zhizhou Yang | e598690 | 2017-08-10 17:37:53 -0700 | [diff] [blame] | 28 | + ldflags: [LDFLAGS_FOR_BENCH_SUITE], |
Zhizhou Yang | 645c664 | 2017-12-13 18:01:43 -0800 | [diff] [blame] | 29 | + |
| 30 | local_include_dirs: [ |
Zhizhou Yang | 2eebfdf | 2018-02-07 18:14:44 -0800 | [diff] [blame] | 31 | "experimental/skottie/", |
| 32 | "experimental/sksg/", |
| 33 | @@ -1803,6 +1809,9 @@ cc_test { |
Zhizhou Yang | 645c664 | 2017-12-13 18:01:43 -0800 | [diff] [blame] | 34 | "skia_tool_deps" |
Zhizhou Yang | e598690 | 2017-08-10 17:37:53 -0700 | [diff] [blame] | 35 | ], |
| 36 | |
Zhizhou Yang | 645c664 | 2017-12-13 18:01:43 -0800 | [diff] [blame] | 37 | + cflags: [CFLAGS_FOR_BENCH_SUITE], |
Zhizhou Yang | e598690 | 2017-08-10 17:37:53 -0700 | [diff] [blame] | 38 | + ldflags: [LDFLAGS_FOR_BENCH_SUITE], |
| 39 | + |
| 40 | local_include_dirs: [ |
| 41 | "bench/", |
Zhizhou Yang | 2eebfdf | 2018-02-07 18:14:44 -0800 | [diff] [blame] | 42 | "experimental/sksg/", |
| 43 | @@ -2388,8 +2397,4 @@ cc_test { |
| 44 | "tools/trace/SkDebugfTracer.cpp", |
| 45 | "tools/trace/SkEventTracingPriv.cpp", |
| 46 | ], |
| 47 | - |
| 48 | - data: [ |
| 49 | - "resources/*", |
| 50 | - ], |
| 51 | } |