summaryrefslogtreecommitdiff
path: root/Hwui_flags_aosp.diff
diff options
context:
space:
mode:
Diffstat (limited to 'Hwui_flags_aosp.diff')
-rw-r--r--Hwui_flags_aosp.diff40
1 files changed, 3 insertions, 37 deletions
diff --git a/Hwui_flags_aosp.diff b/Hwui_flags_aosp.diff
index bf4a3cec..5b8c4e3a 100644
--- a/Hwui_flags_aosp.diff
+++ b/Hwui_flags_aosp.diff
@@ -1,48 +1,14 @@
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
-index ae4eabf94d0..b7f758f1ca5 100644
+index 24d819e93ff2..bdb1bee13bde 100644
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
-@@ -33,8 +33,11 @@ cc_defaults {
+@@ -31,7 +31,9 @@ cc_defaults {
// TODO: Linear blending should be enabled by default, but we are
// TODO: making it an opt-in while it's a work in progress
//"-DANDROID_ENABLE_LINEAR_BLENDING",
+ CFLAGS_FOR_BENCH_SUITE
],
-
+ ldflags: [LDFLAGS_FOR_BENCH_SUITE],
-+
+
include_dirs: [
"external/skia/include/private",
- "external/skia/src/core",
-@@ -236,6 +239,9 @@ cc_defaults {
- export_proto_headers: true,
- },
-
-+ cflags: [CFLAGS_FOR_BENCH_SUITE],
-+ ldflags: [LDFLAGS_FOR_BENCH_SUITE],
-+
- export_include_dirs: ["."],
- export_shared_lib_headers: ["libRScpp"],
- }
-@@ -350,6 +356,9 @@ cc_benchmark {
- whole_static_libs: ["libhwui"],
- shared_libs: ["libmemunreachable"],
-
-+ cflags: [CFLAGS_FOR_BENCH_SUITE],
-+ ldflags: [LDFLAGS_FOR_BENCH_SUITE],
-+
- srcs: [
- "tests/macrobench/TestSceneRunner.cpp",
- "tests/macrobench/main.cpp",
-@@ -367,8 +376,11 @@ cc_benchmark {
- cflags: [
- "-include debug/wrap_gles.h",
- "-DHWUI_NULL_GPU",
-+ CFLAGS_FOR_BENCH_SUITE
- ],
-
-+ ldflags: [LDFLAGS_FOR_BENCH_SUITE],
-+
- whole_static_libs: ["libhwui_static_debug"],
- shared_libs: ["libmemunreachable"],
-