diff options
Diffstat (limited to 'Skia_flags_aosp.diff')
| -rw-r--r-- | Skia_flags_aosp.diff | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/Skia_flags_aosp.diff b/Skia_flags_aosp.diff index b2ff2426..13beaeba 100644 --- a/Skia_flags_aosp.diff +++ b/Skia_flags_aosp.diff @@ -1,28 +1,40 @@ diff --git a/Android.bp b/Android.bp -index a581b0a53..36159c5ae 100644 +index d259f8f13e..b87fccc7b6 100644 --- a/Android.bp +++ b/Android.bp -@@ -40,8 +40,11 @@ cc_library { - "-Wno-clobbered", - "-Wno-error", - "-fexceptions", -+ CFLAGS_FOR_BENCH_SUITE +@@ -9,8 +9,11 @@ cc_library { + "-D_FORTIFY_SOURCE=1", + "-DSKIA_IMPLEMENTATION=1", + "-DATRACE_TAG=ATRACE_TAG_VIEW", ++ CFLAGS_FOR_BENCH_SUITE ], + ldflags: [LDFLAGS_FOR_BENCH_SUITE], + - cppflags: [ - "-std=c++11", - "-fno-threadsafe-statics", -@@ -1470,8 +1473,11 @@ cc_test { - "-U_FORTIFY_SOURCE", - "-D_FORTIFY_SOURCE=1", - "-DSKIA_IMPLEMENTATION=1", -+ CFLAGS_FOR_BENCH_SUITE + export_include_dirs: [ + "include/android/", + "include/c/", +@@ -845,8 +848,11 @@ cc_test { + + cflags: [ + "-Wno-unused-parameter", ++ CFLAGS_FOR_BENCH_SUITE + ], + ++ ldflags: [LDFLAGS_FOR_BENCH_SUITE], ++ + local_include_dirs: [ + "experimental/svg/model/", + "gm/", +@@ -1602,8 +1608,11 @@ cc_test { + + cflags: [ + "-Wno-unused-parameter", ++ CFLAGS_FOR_BENCH_SUITE ], + ldflags: [LDFLAGS_FOR_BENCH_SUITE], + - cppflags: [ - "-std=c++11", - "-fno-threadsafe-statics", + local_include_dirs: [ + "bench/", + "experimental/svg/model/", |