Add android.test.* api files

API txt files for android.test.* are added. The contents are empty as
they didn't exist before API level 28.

android.test.mock.stubs will be generated by soong, so delete the
Android.bp for android.test.mock.stubs

Bug: 77577799
Test: make -j
      mkae checkapi
      make update-api

Merged-In: I4ad641018a45b3a5fef0338fc7fda65800be7b37
Change-Id: I4ad641018a45b3a5fef0338fc7fda65800be7b37
(cherry picked from commit 18afa158e511743f2f834fb72698b91d9966174c)

22 files changed, 1 insertions, 19 deletions

diff --git a/28/public/api/android.test.base-removed.txt b/28/public/api/android.test.base-removed.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/28/public/api/android.test.base-removed.txt
diff --git a/28/public/api/android.test.base.txt b/28/public/api/android.test.base.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/28/public/api/android.test.base.txt
diff --git a/28/public/api/android.test.mock-removed.txt b/28/public/api/android.test.mock-removed.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/28/public/api/android.test.mock-removed.txt
diff --git a/28/public/api/android.test.mock.txt b/28/public/api/android.test.mock.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/28/public/api/android.test.mock.txt
diff --git a/28/public/api/android.test.runner-removed.txt b/28/public/api/android.test.runner-removed.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/28/public/api/android.test.runner-removed.txt
diff --git a/28/public/api/android.test.runner.txt b/28/public/api/android.test.runner.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/28/public/api/android.test.runner.txt
diff --git a/28/system/api/android.test.base-removed.txt b/28/system/api/android.test.base-removed.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/28/system/api/android.test.base-removed.txt
diff --git a/28/system/api/android.test.base.txt b/28/system/api/android.test.base.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/28/system/api/android.test.base.txt
diff --git a/28/system/api/android.test.mock-removed.txt b/28/system/api/android.test.mock-removed.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/28/system/api/android.test.mock-removed.txt
diff --git a/28/system/api/android.test.mock.txt b/28/system/api/android.test.mock.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/28/system/api/android.test.mock.txt
diff --git a/28/system/api/android.test.runner-removed.txt b/28/system/api/android.test.runner-removed.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/28/system/api/android.test.runner-removed.txt
diff --git a/28/system/api/android.test.runner.txt b/28/system/api/android.test.runner.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/28/system/api/android.test.runner.txt
diff --git a/28/test/api/android.test.base-removed.txt b/28/test/api/android.test.base-removed.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/28/test/api/android.test.base-removed.txt
diff --git a/28/test/api/android.test.base.txt b/28/test/api/android.test.base.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/28/test/api/android.test.base.txt
diff --git a/28/test/api/android.test.mock-removed.txt b/28/test/api/android.test.mock-removed.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/28/test/api/android.test.mock-removed.txt
diff --git a/28/test/api/android.test.mock.txt b/28/test/api/android.test.mock.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/28/test/api/android.test.mock.txt
diff --git a/28/test/api/android.test.runner-removed.txt b/28/test/api/android.test.runner-removed.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/28/test/api/android.test.runner-removed.txt
diff --git a/28/test/api/android.test.runner.txt b/28/test/api/android.test.runner.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/28/test/api/android.test.runner.txt
diff --git a/current/Android.bp b/current/Android.bp
deleted file mode 100644
index 4eeaa2ce1..000000000
--- a/current/Android.bp
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (C) 2018 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.
-
-java_import {
-    name: "android.test.mock.stubs",
-    jars: ["public/android.test.mock.jar"],
-    sdk_version: "current",
-}
diff --git a/current/Android.mk b/current/Android.mk
index 8c5c01545..9cb3f0609 100644
--- a/current/Android.mk
+++ b/current/Android.mk
@@ -48,6 +48,7 @@ ifneq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
     prebuilts += \
         android.test.base.stubs:public/android.test.base.jar \
         android.test.runner.stubs:public/android.test.runner.jar \
+        android.test.mock.stubs:public/android.test.mock.jar \
         org.apache.http.legacy:public/org.apache.http.legacy.jar
 
     $(foreach p,$(prebuilts),\
diff --git a/current/system/android.test.base.jar b/current/system/android.test.base.jar
new file mode 100644
index 000000000..74639772a
--- /dev/null
+++ b/current/system/android.test.base.jar
diff --git a/current/system/android.test.runner.jar b/current/system/android.test.runner.jar
new file mode 100644
index 000000000..445a99665
--- /dev/null
+++ b/current/system/android.test.runner.jar