From b69104b2157b3aec72955397df1f209ae025935e Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Tue, 8 Jan 2019 15:21:12 -0800 Subject: Convert Android.mk file to Android.bp. See build/soong/README.md for more information. Bug: 122332282 Test: treehugger Change-Id: I08e4ca466c8701da0307ee2dfe20f4a963f02262 --- tests/Android.bp | 25 +++++++++++++++++++++++++ tests/Android.mk | 33 --------------------------------- 2 files changed, 25 insertions(+), 33 deletions(-) create mode 100644 tests/Android.bp delete mode 100644 tests/Android.mk (limited to 'tests') diff --git a/tests/Android.bp b/tests/Android.bp new file mode 100644 index 0000000..6f1eac2 --- /dev/null +++ b/tests/Android.bp @@ -0,0 +1,25 @@ +// +// Copyright (C) 2012 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: "PartnerBookmarksProviderTest", + // Include all test java files. + srcs: ["src/**/*.java"], + sdk_version: "current", + libs: ["android.test.base.stubs"], + static_libs: ["junit"], + instrumentation_for: "PartnerBookmarksProvider", +} diff --git a/tests/Android.mk b/tests/Android.mk deleted file mode 100644 index 8a107c7..0000000 --- a/tests/Android.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -# Copyright (C) 2012 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) - -# We only want this apk build for tests. -LOCAL_MODULE_TAGS := tests - -# Include all test java files. -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := PartnerBookmarksProviderTest -LOCAL_SDK_VERSION := current - -LOCAL_JAVA_LIBRARIES := android.test.base.stubs -LOCAL_STATIC_JAVA_LIBRARIES := junit - -LOCAL_INSTRUMENTATION_FOR := PartnerBookmarksProvider - -include $(BUILD_PACKAGE) -- cgit v1.2.3