diff options
| author | John W. Bruce <juce@google.com> | 2017-04-29 00:01:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-29 00:01:51 +0000 |
| commit | f3bffa8ef3cfd66680bed95dff30ab436270ac7d (patch) | |
| tree | 514d248eafee5235f38fdea64a513b4ce0641f63 /drm/1.0 | |
| parent | 65ca21fadc21a99664172cdcf13eee4880295c21 (diff) | |
| parent | 3b361d8548dbfb20bc083138deae4636dab7936d (diff) | |
| download | android_hardware_interfaces-f3bffa8ef3cfd66680bed95dff30ab436270ac7d.tar.gz android_hardware_interfaces-f3bffa8ef3cfd66680bed95dff30ab436270ac7d.tar.bz2 android_hardware_interfaces-f3bffa8ef3cfd66680bed95dff30ab436270ac7d.zip | |
Merge "Prefix ENABLE_MEDIADRM_64 with TARGET_" into oc-dev am: 3fec5a6498
am: 3b361d8548
Change-Id: I717ef249e77045bb51a8d39fc20bf35850300f28
Diffstat (limited to 'drm/1.0')
| -rw-r--r-- | drm/1.0/default/Android.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drm/1.0/default/Android.mk b/drm/1.0/default/Android.mk index 760239984..4c05da892 100644 --- a/drm/1.0/default/Android.mk +++ b/drm/1.0/default/Android.mk @@ -41,8 +41,9 @@ LOCAL_C_INCLUDES := \ # TODO(b/18948909) Some legacy DRM plugins only support 32-bit. They need to be # migrated to 64-bit. Once all of a device's legacy DRM plugins support 64-bit, -# that device can turn on ENABLE_MEDIADRM_64 to build this service as 64-bit. -ifneq ($(ENABLE_MEDIADRM_64), true) +# that device can turn on TARGET_ENABLE_MEDIADRM_64 to build this service as +# 64-bit. +ifneq ($(TARGET_ENABLE_MEDIADRM_64), true) LOCAL_32_BIT_ONLY := true endif @@ -80,8 +81,9 @@ LOCAL_C_INCLUDES := \ # TODO: Some legacy DRM plugins only support 32-bit. They need to be migrated to # 64-bit. (b/18948909) Once all of a device's legacy DRM plugins support 64-bit, -# that device can turn on ENABLE_MEDIADRM_64 to build this impl as 64-bit. -ifneq ($(ENABLE_MEDIADRM_64), true) +# that device can turn on TARGET_ENABLE_MEDIADRM_64 to build this impl as +# 64-bit. +ifneq ($(TARGET_ENABLE_MEDIADRM_64), true) LOCAL_32_BIT_ONLY := true endif |