From 2c6a62f8fbfdc4db9cf0a20aab005b1b99bb0988 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Queru <jbq@google.com>
Date: Fri, 15 Jul 2011 17:47:14 -0700
Subject: [PATCH] Remove Camera app from the generic build.

That's because a camera isn't required for compatibility and some
devices don't have a camera.

Add the Camera app in the emulator builds, since the emulator does
have a camera.

Change-Id: I56a1fe9f703c3b05dec99200a9353d75338c5f40
---
 target/product/full.mk                 | 3 +++
 target/product/full_x86.mk             | 3 +++
 target/product/generic_no_telephony.mk | 1 -
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/target/product/full.mk b/target/product/full.mk
index 8231e994d..0f1956bdf 100644
--- a/target/product/full.mk
+++ b/target/product/full.mk
@@ -19,6 +19,9 @@
 # build quite specifically for the emulator, and might not be
 # entirely appropriate to inherit from for on-device configurations.
 
+PRODUCT_PACKAGES := \
+    Camera
+
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk)
 
diff --git a/target/product/full_x86.mk b/target/product/full_x86.mk
index d6a169af3..c7a4cfb95 100644
--- a/target/product/full_x86.mk
+++ b/target/product/full_x86.mk
@@ -26,6 +26,9 @@ ifdef NET_ETH0_STARTONBOOT
   PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1
 endif
 
+PRODUCT_PACKAGES := \
+    Camera
+
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)
 
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 020b0dd2b..f4b9c5101 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -26,7 +26,6 @@ PRODUCT_PACKAGES := \
     Bluetooth \
     Calculator \
     Calendar \
-    Camera \
     CertInstaller \
     DrmProvider \
     Email \
-- 
2.11.0