commit 97df29e2b9c6df88fae9c14daa8e21c9ce5d45bf
author Greg Hartman <ghartman@google.com> Thu Feb 08 20:16:32 2018 -0800
committer Greg Hartman <ghartman@google.com> Thu Feb 08 20:16:32 2018 -0800
tree 6149fe53d0c51040dc82ee33990e3fe81ee357ee
parent 04696f702ad0a4bdc59a4bbe47663a497b6128c8

Fix bad assumptions around architectures

BUG: 73137180
Test: Local build and boot
Change-Id: Ic4eb25592ad87102bad566c391c37dc089dd6a16

services/mediacodec/Android.mk

diff --git a/services/mediacodec/Android.mk b/services/mediacodec/Android.mk
index 5a5fd15..8631c39 100644
--- a/services/mediacodec/Android.mk
+++ b/services/mediacodec/Android.mk
@@ -73,7 +73,11 @@
 # mediacodec runs in 32-bit combatibility mode. For 64 bit architectures,
 # use the 32 bit policy
 ifdef TARGET_2ND_ARCH
+  ifneq ($(TARGET_TRANSLATE_2ND_ARCH),true)
     LOCAL_SRC_FILES := seccomp_policy/mediacodec-$(TARGET_2ND_ARCH).policy
+  else
+    LOCAL_SRC_FILES := seccomp_policy/mediacodec-$(TARGET_ARCH).policy
+  endif
 else
     LOCAL_SRC_FILES := seccomp_policy/mediacodec-$(TARGET_ARCH).policy
 endif