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/Skia_flags_aosp.diff b/Skia_flags_aosp.diff
index 13beaeb..c14c015 100644
--- a/Skia_flags_aosp.diff
+++ b/Skia_flags_aosp.diff
@@ -1,8 +1,8 @@
diff --git a/Android.bp b/Android.bp
-index d259f8f13e..b87fccc7b6 100644
+index 7676cd3ef0..dc4e9c8115 100644
--- a/Android.bp
+++ b/Android.bp
-@@ -9,8 +9,11 @@ cc_library {
+@@ -10,8 +10,11 @@ cc_library {
"-D_FORTIFY_SOURCE=1",
"-DSKIA_IMPLEMENTATION=1",
"-DATRACE_TAG=ATRACE_TAG_VIEW",
@@ -14,27 +14,23 @@
export_include_dirs: [
"include/android/",
"include/c/",
-@@ -845,8 +848,11 @@ cc_test {
-
+@@ -861,7 +864,9 @@ cc_test {
cflags: [
"-Wno-unused-parameter",
+ "-Wno-unused-variable",
+ CFLAGS_FOR_BENCH_SUITE
],
++ ldflags:[LDFLAGS_FOR_BENCH_SUITE],
-+ ldflags: [LDFLAGS_FOR_BENCH_SUITE],
-+
local_include_dirs: [
"experimental/svg/model/",
- "gm/",
-@@ -1602,8 +1608,11 @@ cc_test {
-
+@@ -1640,7 +1645,9 @@ cc_test {
cflags: [
"-Wno-unused-parameter",
+ "-Wno-unused-variable",
+ CFLAGS_FOR_BENCH_SUITE
],
++ ldflags:[LDFLAGS_FOR_BENCH_SUITE],
-+ ldflags: [LDFLAGS_FOR_BENCH_SUITE],
-+
local_include_dirs: [
"bench/",
- "experimental/svg/model/",