From d81904ec7802074b710860a2055af6d97d5bc493 Mon Sep 17 00:00:00 2001 From: Edwin Wong Date: Tue, 4 Dec 2018 11:45:57 -0800 Subject: [PATCH] Move MediaDrmApiTest to its own folder. Merged from http://go/wvgerrit/67523 This is in preparation for adding the Full Decryption Path Test android application so it will reside under vendor/widevine/libwvdrmengine/test/java. Test: build and run MediaDrmAPITest.apk from the new directory bug: 113594822 Change-Id: If4adb51ba7bb24a5e28e04956909c2d5a1af3c53 --- .../test/java/{ => MediaDrmApiTest}/Android.mk | 0 .../java/{ => MediaDrmApiTest}/AndroidManifest.xml | 0 .../java/{ => MediaDrmApiTest}/default.properties | 0 .../res/drawable-hdpi/icon.png | Bin .../res/drawable-ldpi/icon.png | Bin .../res/drawable-mdpi/icon.png | Bin .../java/{ => MediaDrmApiTest}/res/layout/main.xml | 0 .../{ => MediaDrmApiTest}/res/values/strings.xml | 0 .../src/com/widevine/test/KeyRequester.java | 0 .../src/com/widevine/test/MediaDrmAPITest.java | 0 .../src/com/widevine/test/ProvisionRequester.java | 0 .../src/com/widevine/test/TestVector.java | 0 .../src/com/widevine/test/TestVectors.java | 0 tests/Android.mk | 2 +- 14 files changed, 1 insertion(+), 1 deletion(-) rename libwvdrmengine/test/java/{ => MediaDrmApiTest}/Android.mk (100%) rename libwvdrmengine/test/java/{ => MediaDrmApiTest}/AndroidManifest.xml (100%) rename libwvdrmengine/test/java/{ => MediaDrmApiTest}/default.properties (100%) rename libwvdrmengine/test/java/{ => MediaDrmApiTest}/res/drawable-hdpi/icon.png (100%) rename libwvdrmengine/test/java/{ => MediaDrmApiTest}/res/drawable-ldpi/icon.png (100%) rename libwvdrmengine/test/java/{ => MediaDrmApiTest}/res/drawable-mdpi/icon.png (100%) rename libwvdrmengine/test/java/{ => MediaDrmApiTest}/res/layout/main.xml (100%) rename libwvdrmengine/test/java/{ => MediaDrmApiTest}/res/values/strings.xml (100%) rename libwvdrmengine/test/java/{ => MediaDrmApiTest}/src/com/widevine/test/KeyRequester.java (100%) rename libwvdrmengine/test/java/{ => MediaDrmApiTest}/src/com/widevine/test/MediaDrmAPITest.java (100%) rename libwvdrmengine/test/java/{ => MediaDrmApiTest}/src/com/widevine/test/ProvisionRequester.java (100%) rename libwvdrmengine/test/java/{ => MediaDrmApiTest}/src/com/widevine/test/TestVector.java (100%) rename libwvdrmengine/test/java/{ => MediaDrmApiTest}/src/com/widevine/test/TestVectors.java (100%) diff --git a/libwvdrmengine/test/java/Android.mk b/libwvdrmengine/test/java/MediaDrmApiTest/Android.mk similarity index 100% rename from libwvdrmengine/test/java/Android.mk rename to libwvdrmengine/test/java/MediaDrmApiTest/Android.mk diff --git a/libwvdrmengine/test/java/AndroidManifest.xml b/libwvdrmengine/test/java/MediaDrmApiTest/AndroidManifest.xml similarity index 100% rename from libwvdrmengine/test/java/AndroidManifest.xml rename to libwvdrmengine/test/java/MediaDrmApiTest/AndroidManifest.xml diff --git a/libwvdrmengine/test/java/default.properties b/libwvdrmengine/test/java/MediaDrmApiTest/default.properties similarity index 100% rename from libwvdrmengine/test/java/default.properties rename to libwvdrmengine/test/java/MediaDrmApiTest/default.properties diff --git a/libwvdrmengine/test/java/res/drawable-hdpi/icon.png b/libwvdrmengine/test/java/MediaDrmApiTest/res/drawable-hdpi/icon.png similarity index 100% rename from libwvdrmengine/test/java/res/drawable-hdpi/icon.png rename to libwvdrmengine/test/java/MediaDrmApiTest/res/drawable-hdpi/icon.png diff --git a/libwvdrmengine/test/java/res/drawable-ldpi/icon.png b/libwvdrmengine/test/java/MediaDrmApiTest/res/drawable-ldpi/icon.png similarity index 100% rename from libwvdrmengine/test/java/res/drawable-ldpi/icon.png rename to libwvdrmengine/test/java/MediaDrmApiTest/res/drawable-ldpi/icon.png diff --git a/libwvdrmengine/test/java/res/drawable-mdpi/icon.png b/libwvdrmengine/test/java/MediaDrmApiTest/res/drawable-mdpi/icon.png similarity index 100% rename from libwvdrmengine/test/java/res/drawable-mdpi/icon.png rename to libwvdrmengine/test/java/MediaDrmApiTest/res/drawable-mdpi/icon.png diff --git a/libwvdrmengine/test/java/res/layout/main.xml b/libwvdrmengine/test/java/MediaDrmApiTest/res/layout/main.xml similarity index 100% rename from libwvdrmengine/test/java/res/layout/main.xml rename to libwvdrmengine/test/java/MediaDrmApiTest/res/layout/main.xml diff --git a/libwvdrmengine/test/java/res/values/strings.xml b/libwvdrmengine/test/java/MediaDrmApiTest/res/values/strings.xml similarity index 100% rename from libwvdrmengine/test/java/res/values/strings.xml rename to libwvdrmengine/test/java/MediaDrmApiTest/res/values/strings.xml diff --git a/libwvdrmengine/test/java/src/com/widevine/test/KeyRequester.java b/libwvdrmengine/test/java/MediaDrmApiTest/src/com/widevine/test/KeyRequester.java similarity index 100% rename from libwvdrmengine/test/java/src/com/widevine/test/KeyRequester.java rename to libwvdrmengine/test/java/MediaDrmApiTest/src/com/widevine/test/KeyRequester.java diff --git a/libwvdrmengine/test/java/src/com/widevine/test/MediaDrmAPITest.java b/libwvdrmengine/test/java/MediaDrmApiTest/src/com/widevine/test/MediaDrmAPITest.java similarity index 100% rename from libwvdrmengine/test/java/src/com/widevine/test/MediaDrmAPITest.java rename to libwvdrmengine/test/java/MediaDrmApiTest/src/com/widevine/test/MediaDrmAPITest.java diff --git a/libwvdrmengine/test/java/src/com/widevine/test/ProvisionRequester.java b/libwvdrmengine/test/java/MediaDrmApiTest/src/com/widevine/test/ProvisionRequester.java similarity index 100% rename from libwvdrmengine/test/java/src/com/widevine/test/ProvisionRequester.java rename to libwvdrmengine/test/java/MediaDrmApiTest/src/com/widevine/test/ProvisionRequester.java diff --git a/libwvdrmengine/test/java/src/com/widevine/test/TestVector.java b/libwvdrmengine/test/java/MediaDrmApiTest/src/com/widevine/test/TestVector.java similarity index 100% rename from libwvdrmengine/test/java/src/com/widevine/test/TestVector.java rename to libwvdrmengine/test/java/MediaDrmApiTest/src/com/widevine/test/TestVector.java diff --git a/libwvdrmengine/test/java/src/com/widevine/test/TestVectors.java b/libwvdrmengine/test/java/MediaDrmApiTest/src/com/widevine/test/TestVectors.java similarity index 100% rename from libwvdrmengine/test/java/src/com/widevine/test/TestVectors.java rename to libwvdrmengine/test/java/MediaDrmApiTest/src/com/widevine/test/TestVectors.java diff --git a/tests/Android.mk b/tests/Android.mk index 1d25c909..ee1c0311 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -49,5 +49,5 @@ include $(MODULAR_DRM_PATH)/mediacrypto/test/Android.mk include $(MODULAR_DRM_PATH)/mediadrm/test/Android.mk include $(MODULAR_DRM_PATH)/oemcrypto/test/Android.mk include $(MODULAR_DRM_PATH)/test/unit/Android.mk -include $(MODULAR_DRM_PATH)/test/java/Android.mk +include $(MODULAR_DRM_PATH)/test/java/MediaDrmApiTest/Android.mk include $(MODULAR_DRM_PATH)/test/castv2/Android.mk