diff --git a/drm/1.0/vts/functional/Android.bp b/drm/1.0/vts/functional/Android.bp index 235bfb406f..02d4f418f1 100644 --- a/drm/1.0/vts/functional/Android.bp +++ b/drm/1.0/vts/functional/Android.bp @@ -24,7 +24,7 @@ cc_library_static { "vendor_modules.cpp", ], static_libs: [ - "android.hardware.drm@1.0-helper", + "android.hardware.drm@1.0-helper", ], export_include_dirs: ["include"], } @@ -84,6 +84,20 @@ cc_test { "libcrypto_static", "libdrmvtshelper", ], + arch: { + arm: { + data: [":libvtswidevine-arm-prebuilts"], + }, + arm64: { + data: [":libvtswidevine-arm64-prebuilts"], + }, + x86: { + data: [":libvtswidevine-x86-prebuilts"], + }, + x86_64: { + data: [":libvtswidevine-x86_64-prebuilts"], + }, + }, test_suites: [ "general-tests", "vts-core", diff --git a/drm/1.0/vts/functional/AndroidTest.xml b/drm/1.0/vts/functional/AndroidTest.xml new file mode 100644 index 0000000000..92ea7e48dd --- /dev/null +++ b/drm/1.0/vts/functional/AndroidTest.xml @@ -0,0 +1,33 @@ + + + + diff --git a/drm/1.1/vts/functional/Android.bp b/drm/1.1/vts/functional/Android.bp index e08d760ea4..c31aee0827 100644 --- a/drm/1.1/vts/functional/Android.bp +++ b/drm/1.1/vts/functional/Android.bp @@ -60,11 +60,25 @@ cc_test { "drm_hal_test_main.cpp", ], whole_static_libs: [ - "android.hardware.drm@1.1-vts" + "android.hardware.drm@1.1-vts", ], shared_libs: [ "android.hardware.drm@1.1", ], + arch: { + arm: { + data: [":libvtswidevine-arm-prebuilts"], + }, + arm64: { + data: [":libvtswidevine-arm64-prebuilts"], + }, + x86: { + data: [":libvtswidevine-x86-prebuilts"], + }, + x86_64: { + data: [":libvtswidevine-x86_64-prebuilts"], + }, + }, test_suites: [ "general-tests", "vts-core", diff --git a/drm/1.1/vts/functional/AndroidTest.xml b/drm/1.1/vts/functional/AndroidTest.xml new file mode 100644 index 0000000000..65c45accee --- /dev/null +++ b/drm/1.1/vts/functional/AndroidTest.xml @@ -0,0 +1,33 @@ + + + + diff --git a/drm/1.2/vts/functional/Android.bp b/drm/1.2/vts/functional/Android.bp index ecc7d6c592..09727842d0 100644 --- a/drm/1.2/vts/functional/Android.bp +++ b/drm/1.2/vts/functional/Android.bp @@ -70,6 +70,20 @@ cc_test { "libcrypto_static", "libdrmvtshelper", ], + arch: { + arm: { + data: [":libvtswidevine-arm-prebuilts"], + }, + arm64: { + data: [":libvtswidevine-arm64-prebuilts"], + }, + x86: { + data: [":libvtswidevine-x86-prebuilts"], + }, + x86_64: { + data: [":libvtswidevine-x86_64-prebuilts"], + }, + }, test_suites: [ "general-tests", "vts-core", diff --git a/drm/1.2/vts/functional/AndroidTest.xml b/drm/1.2/vts/functional/AndroidTest.xml new file mode 100644 index 0000000000..5da38aefaa --- /dev/null +++ b/drm/1.2/vts/functional/AndroidTest.xml @@ -0,0 +1,33 @@ + + + +