commit 7bf165abfd34c269e87a69924753964294547ae0
author Pirama Arumuga Nainar <pirama@google.com> Wed Jun 16 11:05:54 2021 -0700
committer Pirama Arumuga Nainar <pirama@google.com> Thu Jun 17 13:59:12 2021 -0700
tree c7ce0dfa4bf4edc10bff7de63276576fa5d042d1
parent de5764d19ff1fa7c2bff528864d6252885845454

[libbinder] Disable Sampling PGO for x86, x86_64

Bug: http://b/189438896

Disable sampling PGO (aka AutoFDO) for x86, x86_64.  This is done only
for S (by restricting merge).

Test: verify abi stability across partner and internal builds.

(arbitrary merged-in tag to restrict to sc-dev)

Merged-In: Iba9db702ca6f4a0e590e275bf80e770fb1c7361f
Change-Id: I53b4595c43ade6d068c9c53457cd7e287cec92be

libs/binder/Android.bp

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 91cd90d..46b67b5 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -135,6 +135,20 @@
                 enabled: false,
             },
         },
+        android_arm64: {
+            // b/189438896 Sampling PGO restricted to arm64, arm32 in sc-dev
+            pgo: {
+                sampling: true,
+                profile_file: "libbinder/libbinder.profdata",
+            },
+        },
+        android_arm: {
+            // b/189438896 Sampling PGO restricted to arm64, arm32 in sc-dev
+            pgo: {
+                sampling: true,
+                profile_file: "libbinder/libbinder.profdata",
+            },
+        },
         vendor: {
             exclude_srcs: libbinder_device_interface_sources,
         },
@@ -206,11 +220,6 @@
         "performance*",
         "portability*",
     ],
-
-    pgo: {
-        sampling: true,
-        profile_file: "libbinder/libbinder.profdata",
-    },
 }
 
 // AIDL interface between libbinder and framework.jar