aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2018-08-17 12:09:51 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-08-17 12:09:51 -0700
commit3058bb0c4879d29f86517717b23409f3b9cee9ca (patch)
tree7b3fddd1224e4da860f88e47af51800ae94bd0ca
parentef9f487476465740e774d6d696eaaef72a252c39 (diff)
parent2bf7a91716cd6970bbba6c61a52a5f489806d5d7 (diff)
downloadims-3058bb0c4879d29f86517717b23409f3b9cee9ca.tar.gz
Convert frameworks/opt/net/ims to Android.bp
am: 2bf7a91716 Change-Id: If48ece2afdb2233518ccda5878606ff7169152d5
-rw-r--r--tests/Android.bp35
-rw-r--r--tests/Android.mk36
2 files changed, 35 insertions, 36 deletions
diff --git a/tests/Android.bp b/tests/Android.bp
new file mode 100644
index 00000000..977b5141
--- /dev/null
+++ b/tests/Android.bp
@@ -0,0 +1,35 @@
+//
+// Copyright (C) 2016 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.
+//
+
+android_test {
+ name: "ImsCommonTests",
+
+ srcs: ["src/**/*.java"],
+
+ platform_apis: true,
+ certificate: "platform",
+
+ libs: [
+ "ims-common",
+ "android.test.runner",
+ "android.test.base",
+ ],
+
+ static_libs: [
+ "android-support-test",
+ "mockito-target-minus-junit4",
+ ],
+}
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index a0b998b8..00000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2016 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_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := ImsCommonTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_CERTIFICATE := platform
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_JAVA_LIBRARIES := ims-common \
- android.test.runner \
- android.test.base
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- android-support-test \
- mockito-target-minus-junit4
-
-include $(BUILD_PACKAGE) \ No newline at end of file