| Zhizhou Yang | e598690 | 2017-08-10 17:37:53 -0700 | [diff] [blame^] | 1 | diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp |
| 2 | index 558cdc0faf3..1565be5b201 100644 |
| 3 | --- a/libs/hwui/Android.bp |
| 4 | +++ b/libs/hwui/Android.bp |
| 5 | @@ -24,12 +24,15 @@ cc_defaults { |
| 6 | "-Werror", |
| 7 | "-fvisibility=hidden", |
| 8 | "-DHWUI_NEW_OPS", |
| 9 | + CFLAGS_FOR_BENCH_SUITE |
| 10 | |
| 11 | // GCC false-positives on this warning, and since we -Werror that's |
| 12 | // a problem |
| 13 | "-Wno-free-nonheap-object", |
| 14 | ], |
| 15 | |
| 16 | + ldflags: [LDFLAGS_FOR_BENCH_SUITE], |
| 17 | + |
| 18 | include_dirs: [ |
| 19 | "external/skia/include/private", |
| 20 | "external/skia/src/core", |
| 21 | @@ -214,6 +217,9 @@ cc_defaults { |
| 22 | export_proto_headers: true, |
| 23 | }, |
| 24 | |
| 25 | + cflags: [CFLAGS_FOR_BENCH_SUITE], |
| 26 | + ldflags: [LDFLAGS_FOR_BENCH_SUITE], |
| 27 | + |
| 28 | export_include_dirs: ["."], |
| 29 | } |
| 30 | |
| 31 | @@ -229,7 +235,8 @@ cc_library { |
| 32 | cc_library_static { |
| 33 | name: "libhwui_static_null_gpu", |
| 34 | defaults: ["libhwui_defaults"], |
| 35 | - cflags: ["-DHWUI_NULL_GPU"], |
| 36 | + cflags: ["-DHWUI_NULL_GPU", CFLAGS_FOR_BENCH_SUITE], |
| 37 | + ldflags: [LDFLAGS_FOR_BENCH_SUITE], |
| 38 | srcs: [ |
| 39 | "debug/nullegl.cpp", |
| 40 | "debug/nullgles.cpp", |
| 41 | @@ -319,7 +326,8 @@ cc_benchmark { |
| 42 | name: "hwuimicro", |
| 43 | defaults: ["hwui_test_defaults"], |
| 44 | |
| 45 | - cflags: ["-DHWUI_NULL_GPU"], |
| 46 | + cflags: ["-DHWUI_NULL_GPU", CFLAGS_FOR_BENCH_SUITE], |
| 47 | + ldflags: [LDFLAGS_FOR_BENCH_SUITE], |
| 48 | |
| 49 | whole_static_libs: ["libhwui_static_null_gpu"], |
| 50 | |