diff options
| author | Christopher Wiley <wiley@google.com> | 2016-02-19 19:42:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-19 19:42:01 +0000 |
| commit | 935f252c6e27b477638d2b943fc5bfc89ea13b64 (patch) | |
| tree | e626802d7468476e2c6eb015f154b30c170e7a09 | |
| parent | 9ac3628e4d457307e78c5708aa3000e868d44e1a (diff) | |
| parent | d26e214f5a895f52627c984e3f45680e9c21a014 (diff) | |
| download | goldfish-brillo-m10-release.tar.gz | |
Merge "Build camera related goldfish HALs as brilloemulator for Brillo"android-wear-n-preview-3android-wear-n-preview-1android-n-preview-3android-n-preview-2android-n-preview-1brillo-m10-releasebrillo-m10-dev
| -rw-r--r-- | camera/Android.mk | 5 | ||||
| -rw-r--r-- | opengl/system/gralloc/Android.mk | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index 8982c718..7bde635f 100644 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -64,8 +64,9 @@ LOCAL_SRC_FILES := \ 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 a74f6b02..190bfd63 100644 --- a/opengl/system/gralloc/Android.mk +++ b/opengl/system/gralloc/Android.mk @@ -21,5 +21,8 @@ endef # define gralloc_recipe $(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 |