| commit | 7b507c761af5d312e076b9aa6c6809bd60ddf5d8 | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Thu Mar 29 05:17:04 2018 -0700 |
| committer | Aurimas Liutikas <aurimas@google.com> | Mon Apr 02 17:34:29 2018 -0700 |
| tree | 92c6ce7086351c75112630266a814222d1e34fe5 | |
| parent | d145f36d912d7a79994531bb1c276ef0f9e9fd2d [diff] [blame] |
Move CTS to use androidx. Bug: 76692459 Test: make -j cts Change-Id: Ia873e2657347602c82c2fd9493a228f7657dc9e4
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk index 03ccaea..2ff830f 100644 --- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk +++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk
@@ -30,8 +30,12 @@ android.test.runner.stubs \ android.test.base.stubs \ +LOCAL_USE_AAPT2 := true -LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4 compatibility-device-util ctstestrunner ub-uiautomator +LOCAL_STATIC_JAVA_LIBRARIES = compatibility-device-util ctstestrunner ub-uiautomator + +LOCAL_STATIC_ANDROID_LIBRARIES := \ + androidx.legacy_legacy-support-v4 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/../res