From 6262f3721f07239f7ecd155d0b1fb4bd110d8191 Mon Sep 17 00:00:00 2001 From: "John W. Bruce" Date: Thu, 27 Apr 2017 12:05:36 -0700 Subject: [PATCH] Prefix ENABLE_MEDIADRM_64 with TARGET_ This build-time flag should be prefixed. Bug: 37039525 Test: Built OS Change-Id: Ie1db1f05bdaf43e4066d26a41391af0d7c729128 --- libwvdrmengine/Android.mk | 2 +- libwvdrmengine/cdm/test/unit-test.mk | 2 +- libwvdrmengine/mediacrypto/test/Android.mk | 4 ++-- libwvdrmengine/mediadrm/test/Android.mk | 4 ++-- libwvdrmengine/oemcrypto/test/Android.mk | 2 +- libwvdrmengine/test/unit/Android.mk | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk index e29cd5e8..0fc47467 100644 --- a/libwvdrmengine/Android.mk +++ b/libwvdrmengine/Android.mk @@ -31,7 +31,7 @@ LOCAL_INIT_RC := src_hidl/android.hardware.drm@1.0-service.widevine.rc LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/bin/hw LOCAL_PROPRIETARY_MODULE := true -ifneq ($(ENABLE_MEDIADRM_64), true) +ifneq ($(TARGET_ENABLE_MEDIADRM_64), true) LOCAL_MODULE_TARGET_ARCH := arm x86 mips endif diff --git a/libwvdrmengine/cdm/test/unit-test.mk b/libwvdrmengine/cdm/test/unit-test.mk index b6bba23e..234fc8f8 100644 --- a/libwvdrmengine/cdm/test/unit-test.mk +++ b/libwvdrmengine/cdm/test/unit-test.mk @@ -54,7 +54,7 @@ LOCAL_MODULE_OWNER := widevine LOCAL_PROPRIETARY_MODULE := true -ifneq ($(ENABLE_MEDIADRM_64), true) +ifneq ($(TARGET_ENABLE_MEDIADRM_64), true) LOCAL_MODULE_TARGET_ARCH := arm x86 mips endif diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk index f02e654a..2ed07a3f 100644 --- a/libwvdrmengine/mediacrypto/test/Android.mk +++ b/libwvdrmengine/mediacrypto/test/Android.mk @@ -48,7 +48,7 @@ LOCAL_MODULE_OWNER := widevine LOCAL_PROPRIETARY_MODULE := true -ifneq ($(ENABLE_MEDIADRM_64), true) +ifneq ($(TARGET_ENABLE_MEDIADRM_64), true) LOCAL_MODULE_TARGET_ARCH := arm x86 mips endif @@ -113,7 +113,7 @@ LOCAL_MODULE_OWNER := widevine LOCAL_PROPRIETARY_MODULE := true -ifneq ($(ENABLE_MEDIADRM_64), true) +ifneq ($(TARGET_ENABLE_MEDIADRM_64), true) LOCAL_MODULE_TARGET_ARCH := arm x86 mips endif diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk index bc71e346..a04a4281 100644 --- a/libwvdrmengine/mediadrm/test/Android.mk +++ b/libwvdrmengine/mediadrm/test/Android.mk @@ -48,7 +48,7 @@ LOCAL_MODULE_OWNER := widevine LOCAL_PROPRIETARY_MODULE := true -ifneq ($(ENABLE_MEDIADRM_64), true) +ifneq ($(TARGET_ENABLE_MEDIADRM_64), true) LOCAL_MODULE_TARGET_ARCH := arm x86 mips endif @@ -114,7 +114,7 @@ LOCAL_MODULE_OWNER := widevine LOCAL_PROPRIETARY_MODULE := true -ifneq ($(ENABLE_MEDIADRM_64), true) +ifneq ($(TARGET_ENABLE_MEDIADRM_64), true) LOCAL_MODULE_TARGET_ARCH := arm x86 mips endif diff --git a/libwvdrmengine/oemcrypto/test/Android.mk b/libwvdrmengine/oemcrypto/test/Android.mk index 86fbaab8..2f78507d 100644 --- a/libwvdrmengine/oemcrypto/test/Android.mk +++ b/libwvdrmengine/oemcrypto/test/Android.mk @@ -9,7 +9,7 @@ LOCAL_MODULE_OWNER := widevine LOCAL_PROPRIETARY_MODULE := true -ifneq ($(ENABLE_MEDIADRM_64), true) +ifneq ($(TARGET_ENABLE_MEDIADRM_64), true) LOCAL_MODULE_TARGET_ARCH := arm x86 mips endif diff --git a/libwvdrmengine/test/unit/Android.mk b/libwvdrmengine/test/unit/Android.mk index 47f50056..439c8857 100644 --- a/libwvdrmengine/test/unit/Android.mk +++ b/libwvdrmengine/test/unit/Android.mk @@ -36,7 +36,7 @@ LOCAL_MODULE_OWNER := widevine LOCAL_PROPRIETARY_MODULE := true -ifneq ($(ENABLE_MEDIADRM_64), true) +ifneq ($(TARGET_ENABLE_MEDIADRM_64), true) LOCAL_MODULE_TARGET_ARCH := arm x86 mips endif @@ -84,7 +84,7 @@ LOCAL_MODULE_OWNER := widevine LOCAL_PROPRIETARY_MODULE := true -ifneq ($(ENABLE_MEDIADRM_64), true) +ifneq ($(TARGET_ENABLE_MEDIADRM_64), true) LOCAL_MODULE_TARGET_ARCH := arm x86 mips endif