From 1090663558b1ddb3f9e214e161a60db7b569ed02 Mon Sep 17 00:00:00 2001
From: Devin Moore <devinmoore@google.com>
Date: Tue, 3 Sep 2024 17:19:50 +0000
Subject: [PATCH] Revert "CameraVTS: build with static libhidlbase"

This reverts commit ca6839888e8f82b6f3a1d9f5c42571a72550637b.

Reason for revert: This is likely the cause of b/357792919 and no longer needed for the camera test cases since they have their own defaults.

Merged-In: I4a94280ef2ff63b569d43d8cd90de5a8f2058be9
Change-Id: I4a94280ef2ff63b569d43d8cd90de5a8f2058be9
(cherry picked from commit 8ac9e1b75e4d200dd966ddd42a92c7a530b0b598)
---
 Android.bp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/Android.bp b/Android.bp
index 223a1a91cd..baf3291f60 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,7 +51,6 @@ cc_defaults {
     // Lists all dependencies that can *not* be expected on the device.
     static_libs: [
         "VtsHalHidlTestUtils",
-        "libhidlbase",
         "libhidl-gen-utils",
     ],
 
@@ -64,6 +63,7 @@ cc_defaults {
         "libbase",
         // All the following are dependencies of any HAL definition library.
         "libcutils",
+        "libhidlbase",
         "liblog",
         "libutils",
     ],
@@ -72,14 +72,6 @@ cc_defaults {
         "-g",
     ],
 
-    target: {
-        android: {
-            shared_libs: [
-                "libvndksupport",
-            ],
-        },
-    },
-
     require_root: true,
 }