Merge "Revert "Add SCP support for Android files"" into vic-widevine-dev

libwvdrmengine/Android.bp

@@ -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",
 

libwvdrmengine/cdm/Android.bp

@@ -38,10 +38,7 @@ cc_library_static {
         "external/protobuf/src",
     ],
 
-    header_libs: [
-        "jni_headers",
-        "libutils_headers",
-    ],
+    header_libs: ["libutils_headers"],
 
     static_libs: ["libcdm_protos"],
     shared_libs: ["libcrypto"],

libwvdrmengine/copy_scp_runtime.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# During the protection step, there will be a "libscp_runtime*.a" file in the
-# root directory; link it to a different folder so it can  be loaded with
-# cc_prebuilt_library_static.  During the analysis step, it doesn't exist, so
-# create a placeholder archive.
-
-if [[ ! -e $1 ]]; then
-  printf '!<arch>\n' >"$1"
-fi
-cp "$1" "$2"

libwvdrmengine/level3/Android.bp

@@ -44,9 +44,6 @@ cc_library_static {
         "vendor/widevine/libwvdrmengine/oemcrypto/odk/include",
         "vendor/widevine/libwvdrmengine/oemcrypto/odk/src",
     ],
-    header_libs: [
-        "jni_headers",
-    ],
 
     srcs: [
         "src/generate_entropy_android.cpp",