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

Commit 3c182e20 authored by Bo Hu's avatar Bo Hu Committed by Automerger Merge Worker
Browse files

Merge "drm: allow to build on 64bit only guest" am: 82ae7eb4 am: 0af76f22... 

Merge "drm: allow to build on 64bit only guest" am: 82ae7eb4 am: 0af76f22 am: 08399ec5 am: a558fc75

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1560105

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I959c621340c056205617f404c49b18ff607f24ca
parents 7cfe54b9 a558fc75

drm/1.0/default/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ soong_config_module_type { 


android_hardware_drm_1_0_multilib {

    name: "android.hardware.drm@1.0-multilib-lib",

    compile_multilib: "32",

    compile_multilib: "prefer32",

    soong_config_variables: {

        TARGET_ENABLE_MEDIADRM_64: {

            compile_multilib: "both",
@@ -56,7 +56,7 @@ android_hardware_drm_1_0_multilib { 


android_hardware_drm_1_0_multilib {

    name: "android.hardware.drm@1.0-multilib-exe",

    compile_multilib: "32",

    compile_multilib: "prefer32",

    soong_config_variables: {

        TARGET_ENABLE_MEDIADRM_64: {

            compile_multilib: "first",