From 6430623cc786de2f8b0ce6af95d4da0a42dcc6ea Mon Sep 17 00:00:00 2001
From: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date: Tue, 6 Nov 2012 05:01:17 -0800
Subject: Revert "Added system to build LegacyCamera if specified"

This patch does the complete reverse of what it's supposed to.

"ifeq (,$(findstring LegacyCamera,$(PRODUCT_PACKAGES)))" matches the _absence_ of LegacyCamera in the list of packages.


This reverts commit dd9c5ca25902e723b2229d1438be4c297e6f348a
---
 Android.mk | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/Android.mk b/Android.mk
index e9dcec53d..ea71b3958 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,17 +9,9 @@ LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
-ifeq (,$(findstring LegacyCamera,$(PRODUCT_PACKAGES)))
-LOCAL_SRC_FILES += $(call all-java-files-under, ../LegacyCamera/src)
-else
 LOCAL_SRC_FILES += $(call all-java-files-under, ../Camera/src)
-endif
 
-ifeq (,$(findstring LegacyCamera,$(PRODUCT_PACKAGES)))
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res packages/apps/LegacyCamera/res
-else
 LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res packages/apps/Camera/res
-endif
 LOCAL_AAPT_FLAGS := --auto-add-overlay --extra-packages com.android.camera
 
 LOCAL_PACKAGE_NAME := Gallery2
@@ -28,37 +20,21 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
 
 #LOCAL_SDK_VERSION := current
 
-ifeq (,$(findstring LegacyCamera,$(PRODUCT_PACKAGES)))
-LOCAL_JNI_SHARED_LIBRARIES := libjni_legacymosaic libjni_eglfence
-else
 LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence
-endif
 
-ifeq (,$(findstring LegacyCamera,$(PRODUCT_PACKAGES)))
-LOCAL_REQUIRED_MODULES := libjni_legacymosaic libjni_eglfence
-else
 LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence
-endif
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 include $(BUILD_PACKAGE)
 
-ifeq (,$(findstring LegacyCamera,$(PRODUCT_PACKAGES)))
-include $(call all-makefiles-under, packages/apps/LegacyCamera/jni)
-else
 include $(call all-makefiles-under, jni)
-endif
 
 ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
 # Use the following include to make gallery test apk.
 include $(call all-makefiles-under, $(LOCAL_PATH))
 
 # Use the following include to make camera test apk.
-ifeq (,$(findstring LegacyCamera,$(PRODUCT_PACKAGES)))
-include $(call all-makefiles-under, packages/apps/LegacyCamera)
-else
-include $(call all-makefiles-under, packages/apps/Camera)
-endif
+include $(call all-makefiles-under, ../Camera)
 
 endif
-- 
cgit v1.2.3