From 6ce4a72f01028bf788d0d68a863b291b8d456830 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Wed, 9 Nov 2022 12:49:03 +0000
Subject: Manually tweak framework-adservices 4 and 5

The AdServicesVersion API is being removed in v4, so manually
tweak the finalized v4 and v5 api files until new imports
can be made from the build server.

Bug: 254478113
Test: m checkapi
Change-Id: I94ffe61bd1d8b9fb6698b0153488a5187900bd35
---
 extensions/4/public/api/framework-adservices-removed.txt | 7 +++++++
 extensions/4/public/api/framework-adservices.txt         | 4 ----
 extensions/5/public/api/framework-adservices-removed.txt | 7 +++++++
 extensions/5/public/api/framework-adservices.txt         | 4 ----
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/extensions/4/public/api/framework-adservices-removed.txt b/extensions/4/public/api/framework-adservices-removed.txt
index d802177e2..01c8844f1 100644
--- a/extensions/4/public/api/framework-adservices-removed.txt
+++ b/extensions/4/public/api/framework-adservices-removed.txt
@@ -1 +1,8 @@
 // Signature format: 2.0
+package android.adservices {
+
+  public class AdServicesVersion {
+    field public static final int API_VERSION;
+  }
+
+}
diff --git a/extensions/4/public/api/framework-adservices.txt b/extensions/4/public/api/framework-adservices.txt
index d146378b7..ff975f0b5 100644
--- a/extensions/4/public/api/framework-adservices.txt
+++ b/extensions/4/public/api/framework-adservices.txt
@@ -5,10 +5,6 @@ package android.adservices {
     method public static boolean isAdServicesStateEnabled();
   }
 
-  public class AdServicesVersion {
-    field public static final int API_VERSION;
-  }
-
 }
 
 package android.adservices.adid {
diff --git a/extensions/5/public/api/framework-adservices-removed.txt b/extensions/5/public/api/framework-adservices-removed.txt
index d802177e2..01c8844f1 100644
--- a/extensions/5/public/api/framework-adservices-removed.txt
+++ b/extensions/5/public/api/framework-adservices-removed.txt
@@ -1 +1,8 @@
 // Signature format: 2.0
+package android.adservices {
+
+  public class AdServicesVersion {
+    field public static final int API_VERSION;
+  }
+
+}
diff --git a/extensions/5/public/api/framework-adservices.txt b/extensions/5/public/api/framework-adservices.txt
index ff9e4ecf9..eb1a37aa5 100644
--- a/extensions/5/public/api/framework-adservices.txt
+++ b/extensions/5/public/api/framework-adservices.txt
@@ -5,10 +5,6 @@ package android.adservices {
     method public static boolean isAdServicesStateEnabled();
   }
 
-  public class AdServicesVersion {
-    field public static final int API_VERSION;
-  }
-
 }
 
 package android.adservices.adid {
-- 
cgit v1.2.3