blob: 2a0c54511e1e01107554ac9653aa15ca547fd166 [file] [log] [blame]
Zhizhou Yang2eebfdf2018-02-07 18:14:44 -08001# 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 Yange5986902017-08-10 17:37:53 -07007diff --git a/Android.bp b/Android.bp
Zhizhou Yang2eebfdf2018-02-07 18:14:44 -08008index 9b7dd9b4a2..3bf20bd38c 100644
Zhizhou Yange5986902017-08-10 17:37:53 -07009--- a/Android.bp
10+++ b/Android.bp
Zhizhou Yang645c6642017-12-13 18:01:43 -080011@@ -58,8 +58,11 @@ cc_library_static {
12 "-Wsign-compare",
13 "-Wvla",
14 "-fvisibility=hidden",
Zhizhou Yangf29a55f2017-09-11 11:00:59 -070015+ CFLAGS_FOR_BENCH_SUITE
Zhizhou Yange5986902017-08-10 17:37:53 -070016 ],
Zhizhou Yang645c6642017-12-13 18:01:43 -080017
Zhizhou Yang2eebfdf2018-02-07 18:14:44 -080018+ ldflags: [LDFLAGS_FOR_BENCH_SUITE],
Zhizhou Yang645c6642017-12-13 18:01:43 -080019+
20 cppflags:[
21 "-Wno-abstract-vbase-init",
22 "-Wno-c++98-compat",
Zhizhou Yang2eebfdf2018-02-07 18:14:44 -080023@@ -985,6 +988,9 @@ cc_test {
Zhizhou Yang645c6642017-12-13 18:01:43 -080024 "skia_tool_deps"
25 ],
26
27+ cflags: [CFLAGS_FOR_BENCH_SUITE],
Zhizhou Yange5986902017-08-10 17:37:53 -070028+ ldflags: [LDFLAGS_FOR_BENCH_SUITE],
Zhizhou Yang645c6642017-12-13 18:01:43 -080029+
30 local_include_dirs: [
Zhizhou Yang2eebfdf2018-02-07 18:14:44 -080031 "experimental/skottie/",
32 "experimental/sksg/",
33@@ -1803,6 +1809,9 @@ cc_test {
Zhizhou Yang645c6642017-12-13 18:01:43 -080034 "skia_tool_deps"
Zhizhou Yange5986902017-08-10 17:37:53 -070035 ],
36
Zhizhou Yang645c6642017-12-13 18:01:43 -080037+ cflags: [CFLAGS_FOR_BENCH_SUITE],
Zhizhou Yange5986902017-08-10 17:37:53 -070038+ ldflags: [LDFLAGS_FOR_BENCH_SUITE],
39+
40 local_include_dirs: [
41 "bench/",
Zhizhou Yang2eebfdf2018-02-07 18:14:44 -080042 "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 }