From 5cf20ffccdd5117b3eb4f5084b35a3056191442b Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Fri, 27 Aug 2010 14:26:46 -0700
Subject: Fix module name collision.

Change-Id: I7a9bfa2501cc733dd8c857f5a01ca195f81b95af
---
 Android.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Android.mk b/Android.mk
index 5053e7d..c22bc8a 100755
--- a/Android.mk
+++ b/Android.mk
@@ -1 +1,3 @@
+ifeq ($(TARGET_DEVICE),crespo)
 include $(call all-subdir-makefiles)
+endif
-- 
cgit v1.1


From 2c68f506d7f7f18f600b12dd28fae6041e353355 Mon Sep 17 00:00:00 2001
From: Andy McFadden <fadden@android.com>
Date: Thu, 23 Sep 2010 13:15:54 -0700
Subject: Fix sim-eng build.

Exclude crespo files from sim-eng build.  Some of the makefiles depend
explicitly on libc (which is weird) and libdl (which is normal for us),
and neither of those plays well in sim-eng.

Change-Id: Ia7de38757b54b047aa5ef37758b160e36d2ab9c1
---
 Android.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Android.mk b/Android.mk
index d0ef6e4..dbef347 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,4 +35,6 @@ include $(BUILD_EXECUTABLE)
 
 endif
 
+ifneq ($(TARGET_SIMULATOR),true)
 include $(call all-makefiles-under,$(LOCAL_PATH))
+endif
-- 
cgit v1.1


From 2d316381dd708d200516c7a653c7338b310c591d Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Queru <jbq@google.com>
Date: Tue, 19 Oct 2010 17:30:41 -0700
Subject: Fix build.

Add a stub for new mandatory API

Change-Id: I1117d9605d8fc15b858c369b973c6a9b941e681b
---
 libcamera/SecCameraHWInterface.cpp | 5 +++++
 libcamera/SecCameraHWInterface.h   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/libcamera/SecCameraHWInterface.cpp b/libcamera/SecCameraHWInterface.cpp
index 7da6087..659da07 100644
--- a/libcamera/SecCameraHWInterface.cpp
+++ b/libcamera/SecCameraHWInterface.cpp
@@ -396,6 +396,11 @@ CameraHardwareSec::~CameraHardwareSec()
     singleton.clear();
 }
 
+status_t CameraHardwareSec::setPreviewWindow(const sp<ANativeWindow>& buf)
+{
+    return NO_ERROR;
+}
+
 sp<IMemoryHeap> CameraHardwareSec::getPreviewHeap() const
 {
     return mPreviewHeap;
diff --git a/libcamera/SecCameraHWInterface.h b/libcamera/SecCameraHWInterface.h
index 77865a0..60d58c3 100644
--- a/libcamera/SecCameraHWInterface.h
+++ b/libcamera/SecCameraHWInterface.h
@@ -63,6 +63,7 @@ public:
     virtual CameraParameters  getParameters() const;
     virtual status_t    sendCommand(int32_t command, int32_t arg1,
                                     int32_t arg2);
+    virtual status_t setPreviewWindow(const sp<ANativeWindow>& buf);
     virtual void        release();
 
     static    sp<CameraHardwareInterface> createInstance(int cameraId);
-- 
cgit v1.1


From 0f01a6dc3dec8b506a7c757dd02a6726bad2199c Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Queru <jbq@google.com>
Date: Fri, 22 Oct 2010 16:48:56 -0700
Subject: Use the most appropriate full variant.

This avoids pulling in emulator-specific files into device builds.

Change-Id: I2f446340391e27373e7a8d3b371498e54be197ac
---
 full_crespo.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/full_crespo.mk b/full_crespo.mk
index fcf904a..d86fed2 100644
--- a/full_crespo.mk
+++ b/full_crespo.mk
@@ -34,13 +34,13 @@ PRODUCT_PACKAGES := \
 $(call inherit-product-if-exists, vendor/samsung/crespo/full_crespo-trampoline.mk)
 
 # Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 # This is where we'd set a backup provider if we had one
 #$(call inherit-product, device/sample/products/backup_overlay.mk)
 $(call inherit-product, device/samsung/crespo/device.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full.mk)
 
 # Discard inherited values and use our own instead.
 PRODUCT_NAME := full_crespo
 PRODUCT_DEVICE := crespo
+PRODUCT_BRAND := Android
 PRODUCT_MODEL := Full Android on Crespo
-- 
cgit v1.1