commit e7bc426286525af48dcb58b8c7bb0aba6d734525
author Eran Messeri <eranm@google.com> Thu May 03 13:54:28 2018 +0100
committer Rubin Xu <rubinxu@google.com> Fri May 11 09:06:14 2018 +0000
tree 27c7eca6dc6276b310f56dfe74f8893326f209d7
parent 037b5d7d07bcbf3111418cf7d6e4ece9b9d35b22

Run key management test in profile owner

Move KeyManagementTest to DeviceAndProfileOwner app so it runs under
both device owner and profile owner tests.

Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testKeyManagement
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedProfileOwnerTest#testKeyManagement
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testKeyManagement
Bug: 72658852
Bug: 71421376
Change-Id: I5569d3929c9409046daf8d905c2bb8f6fa106638

hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk

diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk
index 85d7eba..481f821 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk
@@ -31,13 +31,19 @@
 
 LOCAL_USE_AAPT2 := true
 
-LOCAL_STATIC_JAVA_LIBRARIES = compatibility-device-util ctstestrunner ub-uiautomator
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    compatibility-device-util \
+    ctstestrunner \
+    ub-uiautomator \
+    cts-security-test-support-library
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
     androidx.legacy_legacy-support-v4
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/../res
 
+LOCAL_ASSET_DIR := $(LOCAL_PATH)/../assets
+
 # tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts vts general-tests