Add testapi to dist_files.
Also, switch mokito from a static_lib to a lib so the mokito classes
don't end up in the final .jar file (we assume the apps being tested
have their own version of mokito).
Test: m PRODUCT-sdk_gcar_x86-userdebug android.car.testapi dist
Bug: 130293586
Change-Id: Id5c9569e964fdf05071d400eee500993e59f0c3a
diff --git a/car-test-lib/Android.bp b/car-test-lib/Android.bp
index 3d913a0..dc2a64d 100644
--- a/car-test-lib/Android.bp
+++ b/car-test-lib/Android.bp
@@ -24,7 +24,12 @@
},
static_libs: [
"android.car",
+ ],
+ libs: [
"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 6ece515..0000000
--- a/car-test-lib/Android.mk
+++ /dev/null
@@ -1,27 +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.
-#
-#
-
-#disble build in PDK, missing aidl import breaks build
-ifneq ($(TARGET_BUILD_PDK),true)
-
-include $(CLEAR_VARS)
-
-ifeq ($(BOARD_IS_AUTOMOTIVE), true)
-full_classes_jar := $(call intermediates-dir-for,JAVA_LIBRARIES,android.car.testapi,,COMMON)/classes.jar
-$(call dist-for-goals,dist_files,$(full_classes_jar):android.car.testapi.jar)
-endif
-
-endif #TARGET_BUILD_PDK