Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da002fe6 authored by Jeff Tinker's avatar Jeff Tinker
Browse files

Reorganize drm hal modules 

Previously the drm and crypto plugins were separate hals.
This implied a separation of implementation libraries which
causes problems for some drm schemes. The reorganization
combines the hals into a single interface under drm.

Tests: basic gtests passing

Change-Id: I5cde6ff9f60625a0219731c4dbfcaefbd9f27f88
related-to-bug: 32815560
parent f21cdafd

drm/drm/1.0/Android.bp→drm/1.0/Android.bp

+88 −0
Original line number Diff line number Diff line 
// This file is autogenerated by hidl-gen. Do not edit manually.



genrule {

    name: "android.hardware.drm.drm@1.0_genc++",

    name: "android.hardware.drm@1.0_genc++",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm.drm@1.0",

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0",

    srcs: [

        "types.hal",

        "ICryptoFactory.hal",

        "ICryptoPlugin.hal",

        "IDrmFactory.hal",

        "IDrmPlugin.hal",

        "IDrmPluginListener.hal",

    ],

    out: [

        "android/hardware/drm/drm/1.0/types.cpp",

        "android/hardware/drm/drm/1.0/DrmFactoryAll.cpp",

        "android/hardware/drm/drm/1.0/DrmPluginAll.cpp",

        "android/hardware/drm/drm/1.0/DrmPluginListenerAll.cpp",

        "android/hardware/drm/1.0/types.cpp",

        "android/hardware/drm/1.0/CryptoFactoryAll.cpp",

        "android/hardware/drm/1.0/CryptoPluginAll.cpp",

        "android/hardware/drm/1.0/DrmFactoryAll.cpp",

        "android/hardware/drm/1.0/DrmPluginAll.cpp",

        "android/hardware/drm/1.0/DrmPluginListenerAll.cpp",

    ],

}



genrule {

    name: "android.hardware.drm.drm@1.0_genc++_headers",

    name: "android.hardware.drm@1.0_genc++_headers",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm.drm@1.0",

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0",

    srcs: [

        "types.hal",

        "ICryptoFactory.hal",

        "ICryptoPlugin.hal",

        "IDrmFactory.hal",

        "IDrmPlugin.hal",

        "IDrmPluginListener.hal",

    ],

    out: [

        "android/hardware/drm/drm/1.0/types.h",

        "android/hardware/drm/drm/1.0/IDrmFactory.h",

        "android/hardware/drm/drm/1.0/IHwDrmFactory.h",

        "android/hardware/drm/drm/1.0/BnHwDrmFactory.h",

        "android/hardware/drm/drm/1.0/BpHwDrmFactory.h",

        "android/hardware/drm/drm/1.0/BsDrmFactory.h",

        "android/hardware/drm/drm/1.0/IDrmPlugin.h",

        "android/hardware/drm/drm/1.0/IHwDrmPlugin.h",

        "android/hardware/drm/drm/1.0/BnHwDrmPlugin.h",

        "android/hardware/drm/drm/1.0/BpHwDrmPlugin.h",

        "android/hardware/drm/drm/1.0/BsDrmPlugin.h",

        "android/hardware/drm/drm/1.0/IDrmPluginListener.h",

        "android/hardware/drm/drm/1.0/IHwDrmPluginListener.h",

        "android/hardware/drm/drm/1.0/BnHwDrmPluginListener.h",

        "android/hardware/drm/drm/1.0/BpHwDrmPluginListener.h",

        "android/hardware/drm/drm/1.0/BsDrmPluginListener.h",

        "android/hardware/drm/1.0/types.h",

        "android/hardware/drm/1.0/ICryptoFactory.h",

        "android/hardware/drm/1.0/IHwCryptoFactory.h",

        "android/hardware/drm/1.0/BnHwCryptoFactory.h",

        "android/hardware/drm/1.0/BpHwCryptoFactory.h",

        "android/hardware/drm/1.0/BsCryptoFactory.h",

        "android/hardware/drm/1.0/ICryptoPlugin.h",

        "android/hardware/drm/1.0/IHwCryptoPlugin.h",

        "android/hardware/drm/1.0/BnHwCryptoPlugin.h",

        "android/hardware/drm/1.0/BpHwCryptoPlugin.h",

        "android/hardware/drm/1.0/BsCryptoPlugin.h",

        "android/hardware/drm/1.0/IDrmFactory.h",

        "android/hardware/drm/1.0/IHwDrmFactory.h",

        "android/hardware/drm/1.0/BnHwDrmFactory.h",

        "android/hardware/drm/1.0/BpHwDrmFactory.h",

        "android/hardware/drm/1.0/BsDrmFactory.h",

        "android/hardware/drm/1.0/IDrmPlugin.h",

        "android/hardware/drm/1.0/IHwDrmPlugin.h",

        "android/hardware/drm/1.0/BnHwDrmPlugin.h",

        "android/hardware/drm/1.0/BpHwDrmPlugin.h",

        "android/hardware/drm/1.0/BsDrmPlugin.h",

        "android/hardware/drm/1.0/IDrmPluginListener.h",

        "android/hardware/drm/1.0/IHwDrmPluginListener.h",

        "android/hardware/drm/1.0/BnHwDrmPluginListener.h",

        "android/hardware/drm/1.0/BpHwDrmPluginListener.h",

        "android/hardware/drm/1.0/BsDrmPluginListener.h",

    ],

}



cc_library_shared {

    name: "android.hardware.drm.drm@1.0",

    generated_sources: ["android.hardware.drm.drm@1.0_genc++"],

    generated_headers: ["android.hardware.drm.drm@1.0_genc++_headers"],

    export_generated_headers: ["android.hardware.drm.drm@1.0_genc++_headers"],

    name: "android.hardware.drm@1.0",

    generated_sources: ["android.hardware.drm@1.0_genc++"],

    generated_headers: ["android.hardware.drm@1.0_genc++_headers"],

    export_generated_headers: ["android.hardware.drm@1.0_genc++_headers"],

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

drm/crypto/1.0/ICryptoFactory.hal→drm/1.0/ICryptoFactory.hal

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package android.hardware.drm.crypto@1.0;

package android.hardware.drm@1.0;



import ICryptoPlugin;

drm/crypto/1.0/ICryptoPlugin.hal→drm/1.0/ICryptoPlugin.hal

+2 −2
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package android.hardware.drm.crypto@1.0;

package android.hardware.drm@1.0;



import android.hardware.drm.crypto@1.0::types;

import android.hardware.drm@1.0::types;



/**

 * Ref: frameworks/native/include/media/hardware/CryptoAPI.h:CryptoPlugin

drm/drm/1.0/IDrmFactory.hal→drm/1.0/IDrmFactory.hal

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package android.hardware.drm.drm@1.0;

package android.hardware.drm@1.0;



import IDrmPlugin;

drm/drm/1.0/IDrmPlugin.hal→drm/1.0/IDrmPlugin.hal

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package android.hardware.drm.drm@1.0;

package android.hardware.drm@1.0;



import IDrmPluginListener;