Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6430623c authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

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 dd9c5ca2
parent dd9c5ca2

Android.mk

+1 −25
Original line number Diff line number Diff line
@@ -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