From e70cabfba530a4c0308797f8bf491ad0e037e897 Mon Sep 17 00:00:00 2001
From: Amy Zhang <amyjojo@google.com>
Date: Thu, 26 Mar 2020 11:57:35 -0700
Subject: [PATCH] Remove bp and manifest for trm tests

TRM tests are compiled with FrameworksServicesTests

Test: make
Bug: 151186028
Change-Id: Ic8184b431188b9690d4958b0130d2e23b5506d0a
---
 .../server/tv/tunerresourcemanager/Android.bp | 37 -------------------
 .../tunerresourcemanager/AndroidManifest.xml  | 29 ---------------
 .../tv/tunerresourcemanager/AndroidTest.xml   | 29 ---------------
 3 files changed, 95 deletions(-)
 delete mode 100644 services/tests/servicestests/src/com/android/server/tv/tunerresourcemanager/Android.bp
 delete mode 100644 services/tests/servicestests/src/com/android/server/tv/tunerresourcemanager/AndroidManifest.xml
 delete mode 100644 services/tests/servicestests/src/com/android/server/tv/tunerresourcemanager/AndroidTest.xml

diff --git a/services/tests/servicestests/src/com/android/server/tv/tunerresourcemanager/Android.bp b/services/tests/servicestests/src/com/android/server/tv/tunerresourcemanager/Android.bp
deleted file mode 100644
index eb1a2921136db..0000000000000
--- a/services/tests/servicestests/src/com/android/server/tv/tunerresourcemanager/Android.bp
+++ /dev/null
@@ -1,37 +0,0 @@
-android_test {
-    name: "TunerResourceManagerTests",
-
-    // Include all test java files.
-    srcs: [
-        "*.java",
-    ],
-
-    static_libs: [
-        "frameworks-base-testutils",
-        "services.core",
-        "services.devicepolicy",
-        "guava",
-        "androidx.test.core",
-        "androidx.test.ext.truth",
-        "androidx.test.runner",
-        "androidx.test.rules",
-        "mockito-target-minus-junit4",
-        "platform-test-annotations",
-        "truth-prebuilt",
-        "testables",
-        "testng",
-        "servicestests-utils",
-        "service-permission",
-
-    ],
-
-    libs: [
-        "android.test.mock",
-        "android.test.base",
-        "android.test.runner",
-    ],
-
-    platform_apis: true,
-    test_suites: ["general-tests", "device-tests"],
-    compile_multilib: "both",
-}
\ No newline at end of file
diff --git a/services/tests/servicestests/src/com/android/server/tv/tunerresourcemanager/AndroidManifest.xml b/services/tests/servicestests/src/com/android/server/tv/tunerresourcemanager/AndroidManifest.xml
deleted file mode 100644
index 9fa100d5a0411..0000000000000
--- a/services/tests/servicestests/src/com/android/server/tv/tunerresourcemanager/AndroidManifest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.server.tv.tunerresourcemanager">
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-                     android:targetPackage="com.android.server.tv.tunerresourcemanager"
-                     android:label="Tuner Resource Manager Test Cases">
-    </instrumentation>
-</manifest>
-
-
-
diff --git a/services/tests/servicestests/src/com/android/server/tv/tunerresourcemanager/AndroidTest.xml b/services/tests/servicestests/src/com/android/server/tv/tunerresourcemanager/AndroidTest.xml
deleted file mode 100644
index e3ea6a06a115f..0000000000000
--- a/services/tests/servicestests/src/com/android/server/tv/tunerresourcemanager/AndroidTest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="Runs Tests for Tuner Resource Manager">
-    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
-        <option name="test-file-name" value="TunerResourceManagerTests.apk" />
-    </target_preparer>
-
-    <option name="test-suite-tag" value="apct" />
-    <option name="test-suite-tag" value="framework-base-presubmit" />
-    <option name="test-tag" value="TunerResourceManagerTests" />
-    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
-        <option name="package" value="com.android.server.tv.tunerresourcemanager" />
-        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
-        <option name="hidden-api-checks" value="false"/>
-    </test>
-</configuration>
\ No newline at end of file