Merge "drm: allow to build on 64bit only guest" am: 82ae7eb4b5 am: 0af76f22c6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b0fe86749c075e05cfbdee3767a133036351aad
This commit is contained in:
Bo Hu
2021-01-26 23:52:03 +00:00
committed by Automerger Merge Worker

View File

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