From dd9c5ca25902e723b2229d1438be4c297e6f348a Mon Sep 17 00:00:00 2001 From: Rashed Abdel-Tawab Date: Tue, 16 Oct 2012 09:42:04 -0300 Subject: Added system to build LegacyCamera if specified Must be built with the LegacyCamera commit that moves PanoramaActivity to the root directory. Inspired by a patch by Bryan Gantt Cleaned up and enhanced by Rashed Abdel-Tawab Patch set 1: Initial Commit Patch set 2: Fix errors with libjni_legacymosaic.so not building Patch set 3: Clean-up the code Change-Id: Id59e72ada6893c6f6de2b2f486a637509a50d71d --- Android.mk | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index ea71b3958..e9dcec53d 100644 --- a/Android.mk +++ b/Android.mk @@ -9,9 +9,17 @@ 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 @@ -20,21 +28,37 @@ 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. -include $(call all-makefiles-under, ../Camera) +ifeq (,$(findstring LegacyCamera,$(PRODUCT_PACKAGES))) +include $(call all-makefiles-under, packages/apps/LegacyCamera) +else +include $(call all-makefiles-under, packages/apps/Camera) +endif endif -- cgit v1.2.3