Merge "Build camera related goldfish HALs as brilloemulator for Brillo"
diff --git a/camera/Android.mk b/camera/Android.mk
index 8982c71..7bde635 100644
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -64,8 +64,9 @@
fake-pipeline2/JpegCompressor.cpp \
EmulatedCamera3.cpp \
EmulatedFakeCamera3.cpp
-
-ifeq ($(TARGET_PRODUCT),vbox_x86)
+ifeq ($(TARGET_BOARD_PLATFORM),brilloemulator)
+LOCAL_MODULE := camera.$(TARGET_BOARD_PLATFORM)
+else ifeq ($(TARGET_PRODUCT),vbox_x86)
LOCAL_MODULE := camera.vbox_x86
else
LOCAL_MODULE := camera.goldfish
diff --git a/opengl/system/gralloc/Android.mk b/opengl/system/gralloc/Android.mk
index a74f6b0..190bfd6 100644
--- a/opengl/system/gralloc/Android.mk
+++ b/opengl/system/gralloc/Android.mk
@@ -21,5 +21,8 @@
$(eval $(call gralloc_recipe,goldfish))
$(eval $(call gralloc_recipe,ranchu))
+ifeq ($(TARGET_BOARD_PLATFORM),brilloemulator)
+$(eval $(call gralloc_recipe,$(TARGET_BOARD_PLATFORM)))
+endif # defined(BRILLO)
endif # BUILD_EMULATOR_OPENGL_DRIVER != false
