commit 7a697dd3f5c2809ba925ae8799a0127ca9284862
author keunyoung <keunyoung@google.com> Thu Mar 14 22:59:27 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 14 22:59:28 2013 +0000
tree ae80556423907fcf51e8e48e88c1f90bc38aee2e
parent ea871a06499e7433b109852d8fdda781da7c14c2
parent d9b0e80c1d2a70dae1ce7905ff4bfd554029bb88

Merge "add camera.goldfish.jpeg to emulator targets and mini targets" into jb-mr2-dev

target/product/emulator.mk

diff --git a/target/product/emulator.mk b/target/product/emulator.mk
index 1276a8b..439e6c7 100644
--- a/target/product/emulator.mk
+++ b/target/product/emulator.mk
@@ -50,6 +50,7 @@
     qemu-props \
     qemud \
     camera.goldfish \
+    camera.goldfish.jpeg \
     lights.goldfish \
     gps.goldfish \
     sensors.goldfish

target/product/mini.mk

diff --git a/target/product/mini.mk b/target/product/mini.mk
index 10aa1a4..751b481 100644
--- a/target/product/mini.mk
+++ b/target/product/mini.mk
@@ -224,3 +224,7 @@
     Settings \
     libsurfaceflinger_ddmconnection
 
+# This is not necessary for mini, but is for mini-emulator as it should
+# be included in platform.zip
+PRODUCT_PACKAGES += camera.goldfish.jpeg
+