widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add SCP support for Android files"

Browse Source 
This reverts commit 95b50d39ba.

Reason for revert: Rikers changes should go on main. We can decide that partner OEMs can pick up this feature for V once it has been well tested on main.

Change-Id: I129303cbc86e267aba013a7c314724e51477dc82
This commit is contained in:
Rahul Frias
2024-04-17 01:33:26 +00:00
parent 95b50d39ba
commit e24c8dcb86
4 changed files with 2 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
libwvdrmengine/Android.bp
View File

@@ -220,7 +220,6 @@ cc_library_static {
],
header_libs: [
"jni_headers",
"libbase_headers",
"libutils_headers",
],
@@ -253,82 +252,6 @@ filegroup {
],
}
genrule {
name: "libscp_runtime_genrule_x86",
srcs: [
"copy_scp_runtime.sh",
],
out: [
"libscp_runtime_x86.a",
],
cmd: "$(in) libscp_runtime_x86.a $(out)",
}
genrule {
name: "libscp_runtime_genrule_x64",
srcs: [
"copy_scp_runtime.sh",
],
out: [
"libscp_runtime_x64.a",
],
cmd: "$(in) libscp_runtime_x86_64.a $(out)",
}
genrule {
name: "libscp_runtime_genrule_arm",
srcs: [
"copy_scp_runtime.sh",
],
out: [
"libscp_runtime_arm.a",
],
cmd: "$(in) libscp_runtime_armeabi-v7a.a $(out)",
}
genrule {
name: "libscp_runtime_genrule_arm64",
srcs: [
"copy_scp_runtime.sh",
],
out: [
"libscp_runtime_arm64.a",
],
cmd: "$(in) libscp_runtime_arm64-v8a.a $(out)",
}
cc_prebuilt_library_static {
name: "libscp_runtime",
vendor_available: true,
arch: {
x86: {
srcs: [
":libscp_runtime_genrule_x86",
],
},
x86_64: {
srcs: [
":libscp_runtime_genrule_x64",
],
},
arm: {
srcs: [
":libscp_runtime_genrule_arm",
],
},
arm64: {
srcs: [
":libscp_runtime_genrule_arm64",
],
},
},
}
// ----------------------------------------------------------------------------
// Builds libwvaidl.so
//
@@ -370,7 +293,6 @@ cc_library {
"libprotobuf-cpp-lite",
"libutils",
"libwv_odk",
"libscp_runtime",
"libwvdrmcryptoplugin_aidl",
"libwvdrmdrmplugin_aidl",
"libwvlevel3",
@@ -387,10 +309,7 @@ cc_library {
"wv_media_drm_flags_c_lib",
],
header_libs: [
"jni_headers",
"libstagefright_foundation_headers",
],
header_libs: ["libstagefright_foundation_headers"],
owner: "widevine",