commit b136bd7efcdb72249e5c1ec23218da5e1a3aea2b
author Yi Kong <yikong@google.com> Mon Sep 21 19:02:53 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 21 19:02:53 2020 +0000
tree 10bcb88d18154b468b61e9a042dd1ecadb6e931c
parent 40dbf7f67be99fc8948ba2bf9bb5833621e38d6e
parent 0a8a201d856cdfde054640a6c9c7ff2df7cafada

Merge "Use the newly introduced whole_program_vtables property" am: 3dd6b0f059 am: 46eb57c424 am: df3efc6e27 am: 0a8a201d85

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1429863

Change-Id: Ia46e1ce7b3164e52981db4766d19aa52c5b9e2bf

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,