HACK: Workaround hikey64_only target not building with FULL_TREBLE

Unfortunately, the hikey64_only target doesn't build with
FULL_TREBLE as the soft-codecs only build for 32bit and are
required in the current VNDK-core.

Thus, this patch temporarily disables TREBLE on the
hikey64_only target, so that things continue to build.

Once we have 64bit soft-codecs, then we can remove this
extra conditional.

Change-Id: Id7444c23b6e1faedeb163d65fdb1202be04b7302
Signed-off-by: John Stultz <john.stultz@linaro.org>
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index cf4976e..c6fac23 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -16,9 +16,15 @@
 # BT configs
 BOARD_HAVE_BLUETOOTH := true
 
+# HACK! hikey64_only doesn't build w/ VNDK_VERSION=current
+# This is due to software codecs being required but only
+# building for 32bit. Remove the conditional once 64bit
+# soft-codecs work
+ifeq ($(filter hikey64, $(TARGET_DEVICE)),)
 # enable Treble
 PRODUCT_FULL_TREBLE_OVERRIDE := true
 BOARD_VNDK_VERSION := current
+endif
 
 # generic wifi
 WPA_SUPPLICANT_VERSION := VER_0_8_X