commit 6856842f5de9df4860017db01f8f08968cf18a90
author Yi Kong <yikong@google.com> Mon Sep 21 19:04:27 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 21 19:04:27 2020 +0000
tree 6a65cc644a53507200430ba3161274bb47864dc2
parent d11cbc50ceb6a1fadc7c4e4a565b7c8cdcf3de05
parent b136bd7efcdb72249e5c1ec23218da5e1a3aea2b

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

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

Change-Id: I8132af0d03b1bd1f50064b1e8e9cfa9bbda7592a

services/gpuservice/Android.bp

diff --git a/services/gpuservice/Android.bp b/services/gpuservice/Android.bp
index 1bcaab4..9a9bca1 100644
--- a/services/gpuservice/Android.bp
+++ b/services/gpuservice/Android.bp
@@ -44,11 +44,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 04e9a2d..7c08e11 100644
--- a/services/surfaceflinger/Android.bp
+++ b/services/surfaceflinger/Android.bp
@@ -102,11 +102,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,