Update patch files for bp files of benchmarks
The patches for adding flags to benchmarks were out-of-date and caused
patch error while building the benchmarks. For now we still keep these
diffs to add flags.
Fixed them by renewing the patches for binder, dex2oat, hwui, and skia.
Bug: http://b/73090194
Test: Tested and succeeded on all benchmarks.
Change-Id: Icd9160dfcb651fa35f9b3dc1c687c246e19891fe
diff --git a/Hwui_flags_aosp.diff b/Hwui_flags_aosp.diff
index bf4a3ce..5b8c4e3 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"],
-