From 3575d1e55a2ea75f0be5e311d198f6c9c83fb311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= <krzysio@google.com>
Date: Sat, 7 Oct 2023 00:48:07 +0000
Subject: Clean up obsolete aliases for Truth.

Bug: 255714762
Test: presubmit
Change-Id: Ieb6e68bee1a9a60c2978a3b9fdac4f8bd9997e4b
---
 Android.bp | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/Android.bp b/Android.bp
index cb016bb..f846c3c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5,27 +5,27 @@ package {
 java_library {
     name: "ConnectedAppsSDK_Annotations",
     srcs: [
-        "annotations/src/main/java/**/*.java"
+        "annotations/src/main/java/**/*.java",
     ],
-    host_supported: true
+    host_supported: true,
 }
 
 java_library {
     name: "ConnectedAppsSDK_Test_Annotations",
     srcs: [
-        "testing/annotations/src/main/java/**/*.java"
+        "testing/annotations/src/main/java/**/*.java",
     ],
-    host_supported: true
+    host_supported: true,
 }
 
 filegroup {
     name: "ConnectedAppsSDK_Resources",
 
     srcs: [
-        "processor/src/main/resources/**/*"
+        "processor/src/main/resources/**/*",
     ],
 
-    path: "processor/src/main/resources"
+    path: "processor/src/main/resources",
 }
 
 java_plugin {
@@ -40,27 +40,30 @@ java_plugin {
         "error_prone_annotations",
         "guava",
         "ConnectedAppsSDK_Annotations",
-        "ConnectedAppsSDK_Test_Annotations"
+        "ConnectedAppsSDK_Test_Annotations",
     ],
     srcs: [
-        "processor/src/main/java/**/*.java"
+        "processor/src/main/java/**/*.java",
     ],
     java_resources: [
-        ":ConnectedAppsSDK_Resources"
+        ":ConnectedAppsSDK_Resources",
+    ],
+    plugins: [
+        "auto_service_plugin",
+        "auto_value_plugin",
     ],
-    plugins: ["auto_service_plugin", "auto_value_plugin"],
     generates_api: true,
-    use_tools_jar: true
+    use_tools_jar: true,
 }
 
 filegroup {
     name: "ConnectedAppsSDK_AIDL",
 
     srcs: [
-        "sdk/src/main/aidl/**/*.aidl"
+        "sdk/src/main/aidl/**/*.aidl",
     ],
 
-    path: "sdk/src/main/aidl"
+    path: "sdk/src/main/aidl",
 }
 
 android_library {
@@ -68,7 +71,7 @@ android_library {
     sdk_version: "test_current",
     srcs: [
         "sdk/src/main/java/**/*.java",
-        ":ConnectedAppsSDK_AIDL"
+        ":ConnectedAppsSDK_AIDL",
     ],
     static_libs: [
         "ConnectedAppsSDK_Annotations",
@@ -97,7 +100,7 @@ android_library {
     name: "ConnectedAppsSDK_SharedTestApp",
     sdk_version: "test_current",
     srcs: [
-        "tests/shared/src/main/java/**/*.java"
+        "tests/shared/src/main/java/**/*.java",
     ],
     manifest: "tests/shared/src/main/AndroidManifest.xml",
     min_sdk_version: "28",
@@ -105,7 +108,7 @@ android_library {
         "ConnectedAppsSDK_Annotations",
         "ConnectedAppsSDK",
         "guava",
-        "truth-prebuilt"
+        "truth",
     ],
     plugins: ["ConnectedAppsSDK_Processor"],
 }
@@ -114,7 +117,7 @@ android_library {
 android_test {
     name: "ConnectedAppsSDKTest",
     srcs: [
-        "tests/instrumented/src/main/java/**/*.java"
+        "tests/instrumented/src/main/java/**/*.java",
     ],
     test_suites: [
         "general-tests",
@@ -126,9 +129,9 @@ android_test {
         "ConnectedAppsSDK_Testing",
         "androidx.test.ext.junit",
         "ctstestrunner-axt",
-        "truth-prebuilt",
+        "truth",
         "testng", // for assertThrows
     ],
     manifest: "tests/instrumented/src/AndroidManifest.xml",
-    min_sdk_version: "28"
+    min_sdk_version: "28",
 }
-- 
cgit v1.2.3