diff options
| author | Rashed Abdel-Tawab <rashedabdeltawab@gmail.com> | 2012-10-16 09:42:04 -0300 |
|---|---|---|
| committer | Arnav Gupta <championswimmer@gmail.com> | 2012-11-10 16:02:03 +0530 |
| commit | 53d53cfea661102dc992a4fdd6b7f9a60d231987 (patch) | |
| tree | a832a8bbf3ce25e6a187d56c2476ffdf5ae8c3a0 | |
| parent | 6430623cc786de2f8b0ce6af95d4da0a42dcc6ea (diff) | |
| download | android_packages_apps_Gallery2-jellybean-stable.tar.gz android_packages_apps_Gallery2-jellybean-stable.tar.bz2 android_packages_apps_Gallery2-jellybean-stable.zip | |
Added system to build LegacyCamera if specifiedjellybean-stable
Some devices (all 2011 Xperias, and most 2010 legacy devices) cannot use the
default Jellybean camera. Instead they can run the LegacyCamera app
This commit enables using LegacyCamera wrapped into Gallery apk like the
normal JB camera is wrapped into Gallery
To use, just add BOARD_USES_LEGACY_CAMERA := true to your BoardConfig
Credits:
Inspired by a patch by Bryan Gantt <dragonzkiller@gmail.com>
Enhanced by Rashed Abdel-Tawab <rashedabdeltawab@gmail.com>
Thanks for tips and hints from:
- Konsta Tuomio <konsta09@gmail.com>
- Arnav Gupta <championswimmer@gmail.com>
- Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Changelog:
Patch set 1: Fixed up the code
Patch set 2: Use BOARD_USES_LEGACY_CAMERA instead
Patch set 3: Fix up normal Camera stuff
Patch set 4: Clean up. This should be it
Patch set 5: Reomved whitespace, documented the if's and else's, ready to merge now
Change-Id: I2e07032e6a097b8334762af789bf2c72f2515cab
| -rw-r--r-- | Android.mk | 47 |
1 files changed, 46 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index ea71b3958..0045ca186 100644 --- a/Android.mk +++ b/Android.mk @@ -1,3 +1,47 @@ +ifeq ($(BOARD_USES_LEGACY_CAMERA), true) + +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := optional + +LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 +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) +LOCAL_SRC_FILES += $(call all-java-files-under, ../LegacyCamera/src) + +LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res packages/apps/LegacyCamera/res +LOCAL_AAPT_FLAGS := --auto-add-overlay --extra-packages com.android.camera + +LOCAL_PACKAGE_NAME := Gallery2 + +LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D + +#LOCAL_SDK_VERSION := current + +LOCAL_JNI_SHARED_LIBRARIES := libjni_legacymosaic libjni_eglfence + +LOCAL_REQUIRED_MODULES := libjni_legacymosaic libjni_eglfence + +LOCAL_PROGUARD_FLAG_FILES := proguard.flags + +include $(BUILD_PACKAGE) + +include $(call all-makefiles-under, jni) + +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, ../LegacyCamera) +endif #gallery and camera test apk + +else #BOARD_USES_LEGACY_CAMERA + LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -36,5 +80,6 @@ include $(call all-makefiles-under, $(LOCAL_PATH)) # Use the following include to make camera test apk. include $(call all-makefiles-under, ../Camera) +endif #gallery and camera test apk -endif +endif #BOARD_USES_LEGACY_CAMERA |