From 2bf7a91716cd6970bbba6c61a52a5f489806d5d7 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 16 Aug 2018 21:47:55 -0700 Subject: Convert frameworks/opt/net/ims to Android.bp See build/soong/README.md for more information. Test: m checkbuild Test: atest ImsCommonTests Change-Id: Ia7813edb90782e5439acda623f934e2acee2fca7 --- tests/Android.bp | 35 +++++++++++++++++++++++++++++++++++ tests/Android.mk | 36 ------------------------------------ 2 files changed, 35 insertions(+), 36 deletions(-) create mode 100644 tests/Android.bp delete mode 100644 tests/Android.mk 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 -- cgit v1.2.3