diff options
| author | Michael Kolb <kolby@google.com> | 2013-01-29 10:33:22 -0800 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2013-01-29 10:51:20 -0800 |
| commit | 9f60e4709b4740a8fb616346d99d6ed8d919349d (patch) | |
| tree | 4860c190ea7bda17b70a16d504d70020dba50e67 | |
| parent | dbbdb5c63405771a76c168ef569b7a789b3b9d73 (diff) | |
| download | android_packages_apps_Snap-9f60e4709b4740a8fb616346d99d6ed8d919349d.tar.gz android_packages_apps_Snap-9f60e4709b4740a8fb616346d99d6ed8d919349d.tar.bz2 android_packages_apps_Snap-9f60e4709b4740a8fb616346d99d6ed8d919349d.zip | |
Move Camera Java/Native source into Gallery2
Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
| -rw-r--r-- | Android.mk | 7 | ||||
| -rwxr-xr-x | jni_mosaic/Android.mk | 60 |
2 files changed, 62 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index a5efe5500..11c716063 100644 --- a/Android.mk +++ b/Android.mk @@ -11,7 +11,6 @@ LOCAL_STATIC_JAVA_LIBRARIES += mp4parser LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src) LOCAL_SRC_FILES += $(call all-java-files-under, src_pd) -LOCAL_SRC_FILES += $(call all-java-files-under, ../Camera/src) LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res LOCAL_RESOURCE_DIR += packages/apps/Camera/res @@ -41,10 +40,8 @@ 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, ../Camera) +# Use the following include to make gallery test apk and the mosaic library +include $(call all-makefiles-under, $(LOCAL_PATH)) endif diff --git a/jni_mosaic/Android.mk b/jni_mosaic/Android.mk new file mode 100755 index 000000000..9f6f73925 --- /dev/null +++ b/jni_mosaic/Android.mk @@ -0,0 +1,60 @@ +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/feature_stab/db_vlvm \ + $(LOCAL_PATH)/feature_stab/src \ + $(LOCAL_PATH)/feature_stab/src/dbreg \ + $(LOCAL_PATH)/feature_mos/src \ + $(LOCAL_PATH)/feature_mos/src/mosaic + +LOCAL_CFLAGS := -O3 -DNDEBUG -fstrict-aliasing + +LOCAL_SRC_FILES := \ + feature_mos_jni.cpp \ + mosaic_renderer_jni.cpp \ + feature_mos/src/mosaic/trsMatrix.cpp \ + feature_mos/src/mosaic/AlignFeatures.cpp \ + feature_mos/src/mosaic/Blend.cpp \ + feature_mos/src/mosaic/Delaunay.cpp \ + feature_mos/src/mosaic/ImageUtils.cpp \ + feature_mos/src/mosaic/Mosaic.cpp \ + feature_mos/src/mosaic/Pyramid.cpp \ + feature_mos/src/mosaic_renderer/Renderer.cpp \ + feature_mos/src/mosaic_renderer/WarpRenderer.cpp \ + feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp \ + feature_mos/src/mosaic_renderer/YVURenderer.cpp \ + feature_mos/src/mosaic_renderer/FrameBuffer.cpp \ + feature_stab/db_vlvm/db_feature_detection.cpp \ + feature_stab/db_vlvm/db_feature_matching.cpp \ + feature_stab/db_vlvm/db_framestitching.cpp \ + feature_stab/db_vlvm/db_image_homography.cpp \ + feature_stab/db_vlvm/db_rob_image_homography.cpp \ + feature_stab/db_vlvm/db_utilities.cpp \ + feature_stab/db_vlvm/db_utilities_camera.cpp \ + feature_stab/db_vlvm/db_utilities_indexing.cpp \ + feature_stab/db_vlvm/db_utilities_linalg.cpp \ + feature_stab/db_vlvm/db_utilities_poly.cpp \ + feature_stab/src/dbreg/dbreg.cpp \ + feature_stab/src/dbreg/dbstabsmooth.cpp \ + feature_stab/src/dbreg/vp_motionmodel.c + +ifeq ($(TARGET_ARCH), arm) + LOCAL_SDK_VERSION := 9 +endif + +ifeq ($(TARGET_ARCH), x86) + LOCAL_SDK_VERSION := 9 +endif + +ifeq ($(TARGET_ARCH), mips) + LOCAL_SDK_VERSION := 9 +endif + +LOCAL_LDFLAGS := -llog -lGLESv2 + +LOCAL_MODULE_TAGS := optional + +LOCAL_MODULE := libjni_mosaic +include $(BUILD_SHARED_LIBRARY) |