Migrate CtsWindowManagerDeviceTestCases from mk => bp
I needed to add a shared library between the helper app and the test and
noticed the default behavior in the mk rule is to not merge manifests.
Android.bp files do that by default, so I decided to migrate to bp.
I didn't see any reason blocking the migration, so if there is one
please let me know. Used androidmk converter and adapted some srcs to
use the proper filegroups.
Test: Check TH runs CtsWindowManagerDeviceTestCases
Change-Id: Ifcf88a2ddf2462c684ac753f2355d7360cef3e01
diff --git a/tests/framework/base/windowmanager/Android.bp b/tests/framework/base/windowmanager/Android.bp
index 64710de..f530740 100644
--- a/tests/framework/base/windowmanager/Android.bp
+++ b/tests/framework/base/windowmanager/Android.bp
@@ -31,3 +31,42 @@
name: "cts-wm-force-relayout-test-base",
srcs: ["src/android/server/wm/ForceRelayoutTestBase.java"],
}
+
+android_test {
+ name: "CtsWindowManagerDeviceTestCases",
+ defaults: ["cts_defaults"],
+
+ srcs: [
+ "src/**/*.java",
+ "alertwindowservice/src/**/*.java",
+ ":cts-wm-components",
+ ":CtsVerifierMockVrListenerServiceFiles",
+ ],
+
+ resource_dirs: ["res"],
+
+ asset_dirs: ["intent_tests"],
+
+ libs: ["android.test.runner.stubs"],
+
+ static_libs: [
+ "compatibility-device-util-axt",
+ "androidx.test.ext.junit",
+ "androidx.test.rules",
+ "hamcrest-library",
+ "platform-test-annotations",
+ "cts-wm-util",
+ "CtsSurfaceValidatorLib",
+ "CtsMockInputMethodLib",
+ "metrics-helper-lib",
+ "truth-prebuilt",
+ "cts-wm-overlayapp-base",
+ ],
+
+ test_suites: [
+ "cts",
+ "general-tests",
+ ],
+
+ sdk_version: "test_current",
+}
diff --git a/tests/framework/base/windowmanager/Android.mk b/tests/framework/base/windowmanager/Android.mk
deleted file mode 100644
index 8caaa78..0000000
--- a/tests/framework/base/windowmanager/Android.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Copyright (C) 2015 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 optional
-
-LOCAL_SRC_FILES := \
- $(call all-java-files-under, src) \
- $(call all-java-files-under, alertwindowservice/src) \
- $(call all-named-files-under,Components.java, *) \
- ../../../../apps/CtsVerifier/src/com/android/cts/verifier/vr/MockVrListenerService.java \
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_ASSET_DIR := $(LOCAL_PATH)/intent_tests
-
-LOCAL_PACKAGE_NAME := CtsWindowManagerDeviceTestCases
-
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- compatibility-device-util-axt \
- androidx.test.ext.junit \
- androidx.test.rules \
- hamcrest-library \
- platform-test-annotations \
- cts-wm-util \
- CtsSurfaceValidatorLib \
- CtsMockInputMethodLib \
- metrics-helper-lib \
- truth-prebuilt \
-
-LOCAL_COMPATIBILITY_SUITE := cts general-tests
-
-LOCAL_SDK_VERSION := test_current
-
-include $(BUILD_CTS_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
