diff options
Diffstat (limited to 'Skia_flags_internal.diff')
| -rw-r--r-- | Skia_flags_internal.diff | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/Skia_flags_internal.diff b/Skia_flags_internal.diff index 3b3cdc71..2a0c5451 100644 --- a/Skia_flags_internal.diff +++ b/Skia_flags_internal.diff @@ -1,5 +1,11 @@ +# 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 b721f34c50..06942d7e16 100644 +index 9b7dd9b4a2..3bf20bd38c 100644 --- a/Android.bp +++ b/Android.bp @@ -58,8 +58,11 @@ cc_library_static { @@ -9,12 +15,12 @@ index b721f34c50..06942d7e16 100644 + CFLAGS_FOR_BENCH_SUITE ], -+ ldflags:[LDFLAGS_FOR_BENCH_SUITE], ++ ldflags: [LDFLAGS_FOR_BENCH_SUITE], + cppflags:[ "-Wno-abstract-vbase-init", "-Wno-c++98-compat", -@@ -940,6 +943,9 @@ cc_test { +@@ -985,6 +988,9 @@ cc_test { "skia_tool_deps" ], @@ -22,9 +28,9 @@ index b721f34c50..06942d7e16 100644 + ldflags: [LDFLAGS_FOR_BENCH_SUITE], + local_include_dirs: [ - "experimental/svg/model/", - "gm/", -@@ -1701,6 +1707,9 @@ cc_test { + "experimental/skottie/", + "experimental/sksg/", +@@ -1803,6 +1809,9 @@ cc_test { "skia_tool_deps" ], @@ -33,4 +39,13 @@ index b721f34c50..06942d7e16 100644 + local_include_dirs: [ "bench/", - "experimental/svg/model/", + "experimental/sksg/", +@@ -2388,8 +2397,4 @@ cc_test { + "tools/trace/SkDebugfTracer.cpp", + "tools/trace/SkEventTracingPriv.cpp", + ], +- +- data: [ +- "resources/*", +- ], + } |