Build camera with the proper arcs.
Bug: 71707530
Test: both 32- and 64-bit cameras are built on the 64-bit
device. The camera hal loads up on the 64-bit device.
Change-Id: I1cd51fe2ed7e8daddb75d52a3e72a8e6860b358e
diff --git a/guest/hals/camera/Android.mk b/guest/hals/camera/Android.mk
index 32eb3a5..bf9bc35 100644
--- a/guest/hals/camera/Android.mk
+++ b/guest/hals/camera/Android.mk
@@ -94,7 +94,9 @@
else
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/${emulator_camera_module_relative_path}
endif
+ifeq (true, $(TARGET_TRANSLATE_2ND_ARCH))
LOCAL_MULTILIB := first
+endif
LOCAL_CFLAGS := ${emulator_camera_cflags}
LOCAL_CLANG_CFLAGS += ${emulator_camera_clang_flags}
@@ -163,7 +165,9 @@
else
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/${emulator_camera_module_relative_path}
endif
+ifeq (true, $(TARGET_TRANSLATE_2ND_ARCH))
LOCAL_MULTILIB := first
+endif
LOCAL_CFLAGS += ${jpeg_cflags}
LOCAL_CLANG_CFLAGS += ${jpeg_clangflags}