Snap for 4620899 from ce43588700ff84f20b6bf6a513d8932f693e33dd to pi-release
Change-Id: I3d3e68045925d0e9bb805fc33ef196c9f220929c
diff --git a/Binder_flags_aosp.diff b/Binder_flags_aosp.diff
index 5492b91..693a784 100644
--- a/Binder_flags_aosp.diff
+++ b/Binder_flags_aosp.diff
@@ -1,8 +1,8 @@
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
-index f7347aef1..a539fac47 100644
+index 57c87756e..0f34bcff7 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
-@@ -52,10 +52,12 @@ cc_library {
+@@ -80,7 +80,9 @@ cc_library {
"-Wall",
"-Wextra",
"-Werror",
@@ -11,33 +11,4 @@
+ ldflags: [LDFLAGS_FOR_BENCH_SUITE],
product_variables: {
binder32bit: {
-- cflags: ["-DBINDER_IPC_32BIT=1"],
-+ cflags: ["-DBINDER_IPC_32BIT=1",],
- },
- },
-
-@@ -76,4 +78,22 @@ cc_library {
- },
- }
-
--subdirs = ["tests"]
-+cc_test {
-+ name: "binderThroughputTest",
-+ srcs: ["tests/binderThroughputTest.cpp"],
-+ shared_libs: [
-+ "libbinder",
-+ "libutils",
-+ ],
-+ clang: true,
-+ cflags: [
-+ "-g",
-+ "-Wall",
-+ "-Werror",
-+ "-Wno-missing-field-initializers",
-+ "-Wno-sign-compare",
-+ "-O3",
-+ CFLAGS_FOR_BENCH_SUITE
-+ ],
-+ ldflags: [LDFLAGS_FOR_BENCH_SUITE],
-+}
-+
+ cflags: ["-DBINDER_IPC_32BIT=1"],
diff --git a/Binder_flags_internal.diff b/Binder_flags_internal.diff
index 5d8e45b..693a784 100644
--- a/Binder_flags_internal.diff
+++ b/Binder_flags_internal.diff
@@ -1,8 +1,8 @@
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
-index f7347aef1..a539fac47 100644
+index 57c87756e..0f34bcff7 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
-@@ -52,10 +52,12 @@ cc_library {
+@@ -80,7 +80,9 @@ cc_library {
"-Wall",
"-Wextra",
"-Werror",
@@ -11,8 +11,4 @@
+ ldflags: [LDFLAGS_FOR_BENCH_SUITE],
product_variables: {
binder32bit: {
-- cflags: ["-DBINDER_IPC_32BIT=1"],
-+ cflags: ["-DBINDER_IPC_32BIT=1",],
- },
- },
-
+ cflags: ["-DBINDER_IPC_32BIT=1"],
diff --git a/Dex2oat_flags_aosp.diff b/Dex2oat_flags_aosp.diff
index 4da8b2c..e094068 100644
--- a/Dex2oat_flags_aosp.diff
+++ b/Dex2oat_flags_aosp.diff
@@ -1,14 +1,14 @@
diff --git a/compiler/Android.bp b/compiler/Android.bp
-index 1e4cdf2bd..e14dce8d7 100644
+index 2e60e7d658..51f20a86ef 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
-@@ -197,6 +197,9 @@ art_cc_defaults {
- "art_cmdlineparser_headers", // For compiler_options.
+@@ -195,6 +195,9 @@ art_cc_defaults {
],
+ export_include_dirs: ["."],
++
+ cflags: [CFLAGS_FOR_BENCH_SUITE],
+ ldflags: [LDFLAGS_FOR_BENCH_SUITE],
-+
- export_include_dirs: ["."],
}
+ gensrcs {
diff --git a/Dex2oat_flags_internal.diff b/Dex2oat_flags_internal.diff
index a52a67f..e094068 100644
--- a/Dex2oat_flags_internal.diff
+++ b/Dex2oat_flags_internal.diff
@@ -1,8 +1,8 @@
diff --git a/compiler/Android.bp b/compiler/Android.bp
-index fe0f3c75c5..d0430bcd55 100644
+index 2e60e7d658..51f20a86ef 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
-@@ -199,6 +199,9 @@ art_cc_defaults {
+@@ -195,6 +195,9 @@ art_cc_defaults {
],
export_include_dirs: ["."],
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"],
-
diff --git a/Hwui_flags_internal.diff b/Hwui_flags_internal.diff
index ff0f4e7..5b8c4e3 100644
--- a/Hwui_flags_internal.diff
+++ b/Hwui_flags_internal.diff
@@ -1,48 +1,14 @@
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
-index ae4eabf94d0..23c95465221 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"],
-
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/",
diff --git a/Skia_flags_internal.diff b/Skia_flags_internal.diff
index 3b3cdc7..2a0c545 100644
--- a/Skia_flags_internal.diff
+++ b/Skia_flags_internal.diff
@@ -1,5 +1,11 @@
+# TO CLARIFY:
+# This patch will remove the attempt to copy resources to device,
+# because there is a bug (http://b/71906438) forbiding copying subdirectory.
+# Since we are using mma to build and copy resources manually to device,
+# at this moment we remove this part to work around with the bug.
+
diff --git a/Android.bp b/Android.bp
-index b721f34c50..06942d7e16 100644
+index 9b7dd9b4a2..3bf20bd38c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -58,8 +58,11 @@ cc_library_static {
@@ -9,12 +15,12 @@
+ CFLAGS_FOR_BENCH_SUITE
],
-+ ldflags:[LDFLAGS_FOR_BENCH_SUITE],
++ ldflags: [LDFLAGS_FOR_BENCH_SUITE],
+
cppflags:[
"-Wno-abstract-vbase-init",
"-Wno-c++98-compat",
-@@ -940,6 +943,9 @@ cc_test {
+@@ -985,6 +988,9 @@ cc_test {
"skia_tool_deps"
],
@@ -22,9 +28,9 @@
+ ldflags: [LDFLAGS_FOR_BENCH_SUITE],
+
local_include_dirs: [
- "experimental/svg/model/",
- "gm/",
-@@ -1701,6 +1707,9 @@ cc_test {
+ "experimental/skottie/",
+ "experimental/sksg/",
+@@ -1803,6 +1809,9 @@ cc_test {
"skia_tool_deps"
],
@@ -33,4 +39,13 @@
+
local_include_dirs: [
"bench/",
- "experimental/svg/model/",
+ "experimental/sksg/",
+@@ -2388,8 +2397,4 @@ cc_test {
+ "tools/trace/SkDebugfTracer.cpp",
+ "tools/trace/SkEventTracingPriv.cpp",
+ ],
+-
+- data: [
+- "resources/*",
+- ],
+ }
