Stop making test client app as a system app

Changing test client app type from  android_app to
android_test_helper_app which means test client app will be no longer a
system app.

After this change the test client app will no longer be automatically
installed when flashinbg the device and it has to be manually installed.
That would also help to simply uninistall the app without root access or
remount the device.

Test: m SdkSandboxClient &&
      adb install -d ${OUT}/testcases/SdkSandboxClient/arm64/SdkSandboxClient.apk
Bug: 248536757
Change-Id: Ib6e62816d26aebddd2a29b4cb99b7e3c6475bcef

2 files changed, 5 insertions, 14 deletions

diff --git a/sdksandbox/tests/manual-test-apps/SdkSandboxClient/Android.bp b/sdksandbox/tests/manual-test-apps/SdkSandboxClient/Android.bp
index 7a4111aec3..c3003fa02a 100644
--- a/sdksandbox/tests/manual-test-apps/SdkSandboxClient/Android.bp
+++ b/sdksandbox/tests/manual-test-apps/SdkSandboxClient/Android.bp
@@ -16,20 +16,12 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-android_app {
+android_test_helper_app {
     name: "SdkSandboxClient",
     defaults: ["platform_app_defaults"],
     platform_apis: true,
-    srcs: [
-        "src/**/sdksandboxclient/*.java",
-    ],
-    static_libs: [
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "SdkInterfaces",
-    ],
-    resource_dirs: [
-        "res",
-    ],
+    srcs: ["src/**/sdksandboxclient/*.java"],
+    static_libs: ["SdkInterfaces"],
+    resource_dirs: ["res"],
     manifest: "AndroidManifest_Client.xml",
 }
diff --git a/sdksandbox/tests/manual-test-apps/SdkSandboxClient/src/com/android/sdksandboxclient/MainActivity.java b/sdksandbox/tests/manual-test-apps/SdkSandboxClient/src/com/android/sdksandboxclient/MainActivity.java
index 7188e85436..4d574496d8 100644
--- a/sdksandbox/tests/manual-test-apps/SdkSandboxClient/src/com/android/sdksandboxclient/MainActivity.java
+++ b/sdksandbox/tests/manual-test-apps/SdkSandboxClient/src/com/android/sdksandboxclient/MainActivity.java
@@ -22,6 +22,7 @@ import static android.app.sdksandbox.SdkSandboxManager.EXTRA_HOST_TOKEN;
 import static android.app.sdksandbox.SdkSandboxManager.EXTRA_SURFACE_PACKAGE;
 import static android.app.sdksandbox.SdkSandboxManager.EXTRA_WIDTH_IN_PIXELS;
 
+import android.annotation.NonNull;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.sdksandbox.LoadSdkException;
@@ -44,8 +45,6 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
 
-import androidx.annotation.NonNull;
-
 public class MainActivity extends Activity {
     private static final String SDK_NAME = "com.android.sdksandboxcode";
     private static final String TAG = "SdkSandboxClientMainActivity";