From 6f4e26df2b1c350bd34e98f7512092721ef91511 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 16 Sep 2021 18:35:01 -0700 Subject: [PATCH] Convert DownloadManagerTestApp to Android.bp See build/soong/README.md for more information. Test: mma Change-Id: I2d3fefc4467cde83d8a93217935b908230bcbade --- core/tests/hosttests/Android.mk | 20 ---------- core/tests/hosttests/test-apps/Android.mk | 21 ---------- .../DownloadManagerTestApp/Android.bp | 38 +++++++++++++++++++ .../DownloadManagerTestApp/Android.mk | 37 ------------------ 4 files changed, 38 insertions(+), 78 deletions(-) delete mode 100644 core/tests/hosttests/Android.mk delete mode 100644 core/tests/hosttests/test-apps/Android.mk create mode 100644 core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.bp delete mode 100644 core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk diff --git a/core/tests/hosttests/Android.mk b/core/tests/hosttests/Android.mk deleted file mode 100644 index f26d401bea1a..000000000000 --- a/core/tests/hosttests/Android.mk +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2010 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) - -# Build the test APKs using their own makefiles -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/core/tests/hosttests/test-apps/Android.mk b/core/tests/hosttests/test-apps/Android.mk deleted file mode 100644 index e25764ff0ad2..000000000000 --- a/core/tests/hosttests/test-apps/Android.mk +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (C) 2010 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) - -# Build the test APKs using their own makefiles -include $(call all-makefiles-under,$(LOCAL_PATH)) - diff --git a/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.bp b/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.bp new file mode 100644 index 000000000000..d439124c72cb --- /dev/null +++ b/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.bp @@ -0,0 +1,38 @@ +// Copyright (C) 2010 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. + +package { + default_applicable_licenses: ["frameworks_base_license"], +} + +android_test { + name: "DownloadManagerTestApp", + + srcs: ["src/**/*.java"], + + static_libs: [ + "android-common", + "mockwebserver", + "junit", + ], + libs: [ + "android.test.runner", + "android.test.base", + ], + + platform_apis: true, + + // Need to run as system app to get access to Settings. This test won't work for user builds. + certificate: "platform", +} diff --git a/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk b/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk deleted file mode 100644 index d9e61512115d..000000000000 --- a/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (C) 2010 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_TAGS := tests - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_STATIC_JAVA_LIBRARIES := android-common mockwebserver junit -LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base - -LOCAL_PACKAGE_NAME := DownloadManagerTestApp -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../NOTICE -LOCAL_PRIVATE_PLATFORM_APIS := true - -ifneq ($(TARGET_BUILD_VARIANT),user) -# Need to run as system app to get access to Settings. This test won't work for user builds. -LOCAL_CERTIFICATE := platform -endif - -include $(BUILD_PACKAGE)