From a5210bff019091c26f2545eba4801e4e72f78f8e Mon Sep 17 00:00:00 2001
From: Yi Kong <yikong@google.com>
Date: Mon, 27 Dec 2021 21:34:29 +0800
Subject: Remove PGO rules for libhwbinder

The instrumentation PGO pipeline is deprecated and to be replaced
by AFDO.

Test: presubmit
Change-Id: I4b0b869fe194285710baefe500d75254d7e7fbaa
---
 Android.bp                 | 36 ------------------------------------
 vts/performance/Android.bp |  3 +--
 2 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/Android.bp b/Android.bp
index 3a4ef35..1ca91b3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -121,7 +121,6 @@ cc_library_static {
     defaults: [
         "libhwbinder_defaults",
         "libhwbinder-impl-shared-libs",
-        "hwbinder_pgo",
         "hwbinder_lto",
     ],
     host_supported: true,
@@ -141,41 +140,6 @@ cc_library_static {
     min_sdk_version: "29",
 }
 
-// Only libhwbinder_benchmark needs to have pgo enabled. When all places
-// support having PGO selectively enabled, all places can use libhwbinder.
-//
-// http://b/77320844
-cc_library_static {
-    name: "libhwbinder_pgo-impl-internal",
-    defaults: [
-        "libhwbinder_defaults",
-        "libhwbinder-impl-shared-libs",
-        "hwbinder_benchmark_pgo",
-        "hwbinder_lto",
-    ],
-}
-
-// Provide pgo property to build hwbinder with PGO
-cc_defaults {
-    name: "hwbinder_pgo",
-    pgo: {
-        instrumentation: true,
-        profile_file: "hwbinder/hwbinder.profdata",
-        benchmarks: ["hwbinder"],
-        enable_profile_use: true,
-    },
-}
-
-cc_defaults {
-    name: "hwbinder_benchmark_pgo",
-    pgo: {
-        instrumentation: true,
-        profile_file: "hwbinder/hwbinder.profdata",
-        benchmarks: ["hwbinder_benchmark"],
-        enable_profile_use: true,
-    },
-}
-
 // Provide lto property to build hwbinder with LTO
 cc_defaults {
     name: "hwbinder_lto",
diff --git a/vts/performance/Android.bp b/vts/performance/Android.bp
index 9508c83..fbb9f34 100644
--- a/vts/performance/Android.bp
+++ b/vts/performance/Android.bp
@@ -24,7 +24,6 @@ package {
 
 cc_defaults {
     name: "libhwbinder_test_defaults",
-    defaults: ["hwbinder_benchmark_pgo",],
 
     cflags: [
         "-Wall",
@@ -40,7 +39,7 @@ cc_defaults {
 
     static_libs: [
         "android.hardware.tests.libhwbinder@1.0",
-        "libhidlbase_pgo",
+        "libhidlbase",
     ],
 
     // Allow dlsym'ing self for statically linked passthrough implementations
-- 
cgit v1.2.3