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