commit bf2aa784bb2ee0a27800abc55b6e6b9b77c2e6f4
author Yi Kong <yikong@google.com> Mon Sep 21 01:25:16 2020 +0800
committer Yi Kong <yikong@google.com> Mon Sep 21 08:48:52 2020 +0800
tree 796768f8a8470b8de8fb2ab75c3fd6f3a3306f50
parent f1d96134672648dd55ee67eb19911cebb19d8e02

Use the newly introduced whole_program_vtables property

... instead of manually adding -fwhole-program-vtables cflag.

Test: build
Bug: 169004486
Change-Id: Ie04b0ef3d5621b8304b6c04f92a00411cb0ea3ec

services/gpuservice/Android.bp

diff --git a/services/gpuservice/Android.bp b/services/gpuservice/Android.bp
index 6eed24a..4da6db3 100644
--- a/services/gpuservice/Android.bp
+++ b/services/gpuservice/Android.bp
@@ -42,11 +42,11 @@
     defaults: ["libgpuservice_defaults"],
     cflags: [
         "-fvisibility=hidden",
-        "-fwhole-program-vtables", // requires ThinLTO
     ],
     lto: {
         thin: true,
     },
+    whole_program_vtables: true, // Requires ThinLTO
 }
 
 filegroup {

services/surfaceflinger/Android.bp

diff --git a/services/surfaceflinger/Android.bp b/services/surfaceflinger/Android.bp
index a790d0b..bdd04db 100644
--- a/services/surfaceflinger/Android.bp
+++ b/services/surfaceflinger/Android.bp
@@ -108,11 +108,11 @@
     defaults: ["libsurfaceflinger_defaults"],
     cflags: [
         "-fvisibility=hidden",
-        "-fwhole-program-vtables", // requires ThinLTO
     ],
     lto: {
         thin: true,
     },
+    whole_program_vtables: true, // Requires ThinLTO
     // TODO(b/131771163): Fix broken fuzzer support with LTO.
     sanitize: {
         fuzzer: false,