Changed android.car.testapi build back to using soong

The build file for building android.car.testapi was changed from using
soong to make. This was because testapi required a dependency that was
built with make. This dependency has since been converted to use soong,
so the testapi can use soong to build as well. There was also a
regression introduced in the original conversion from soong to make,
which caused it to not be copied to dist in dist builds, and this change
addresses that as well.

Test: Verify android.car.testapi.jar is in dist artifacts for the
hawk-userdebug target on master.

Change-Id: I1bb9533585230d3251a91823c95cf8ac49acc742
diff --git a/car-test-lib/Android.bp b/car-test-lib/Android.bp
new file mode 100644
index 0000000..aaa9138
--- /dev/null
+++ b/car-test-lib/Android.bp
@@ -0,0 +1,34 @@
+// Copyright (C) 2019 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_library {
+    name: "android.car.testapi",
+    srcs: [
+        "src/**/*.java",
+    ],
+    product_variables: {
+        pdk: {
+            enabled: false,
+        },
+    },
+    static_libs: [
+        "android.car",
+        "car-service-lib-for-test",
+        "mockito",
+    ],
+    installable: false,
+    dist: {
+        targets: ["dist_files"],
+    }
+}
diff --git a/car-test-lib/Android.mk b/car-test-lib/Android.mk
deleted file mode 100644
index 7f6ee65..0000000
--- a/car-test-lib/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (C) 2019 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.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android.car.testapi
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    android.car \
-    car-service-lib-for-test
-
-LOCAL_JAVA_LIBRARIES := \
-    mockito
-
-include $(BUILD_JAVA_LIBRARY)