From 0372c360195f856b09c5f3679179cfdbb185e649 Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Thu, 20 Jun 2013 18:32:26 -0700
Subject: Remove SRI panorama

Change-Id: Icbe154aede474fb678ae4e0b2088626a4a8b31d8
---
 Android.mk                    |  6 ++---
 jni_mosaic/Android.mk         | 60 -------------------------------------------
 perftests/panorama/Android.mk | 26 -------------------
 3 files changed, 3 insertions(+), 89 deletions(-)
 delete mode 100755 jni_mosaic/Android.mk
 delete mode 100755 perftests/panorama/Android.mk

diff --git a/Android.mk b/Android.mk
index c17ee0421..2dd759f30 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,9 +37,9 @@ LOCAL_SDK_VERSION := current
 # the libraries in the APK, otherwise just put them in /system/lib and
 # leave them out of the APK
 ifneq (,$(TARGET_BUILD_APPS))
-  LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence libjni_filtershow_filters librsjni
+  LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni
 else
-  LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence libjni_filtershow_filters
+  LOCAL_REQUIRED_MODULES := libjni_eglfence libjni_filtershow_filters
 endif
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
@@ -50,7 +50,7 @@ include $(call all-makefiles-under, jni)
 
 ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
 
-# Use the following include to make gallery test apk and the mosaic library
+# Use the following include to make gallery test apk
 include $(call all-makefiles-under, $(LOCAL_PATH))
 
 endif
diff --git a/jni_mosaic/Android.mk b/jni_mosaic/Android.mk
deleted file mode 100755
index 9f6f73925..000000000
--- a/jni_mosaic/Android.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-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)
diff --git a/perftests/panorama/Android.mk b/perftests/panorama/Android.mk
deleted file mode 100755
index 17632df5c..000000000
--- a/perftests/panorama/Android.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-local_target_dir := $(TARGET_OUT_DATA)/local/tmp
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../../jni_mosaic/feature_mos/src \
-    $(LOCAL_PATH)/../../jni_mosaic/feature_stab/src \
-    $(LOCAL_PATH)/../../jni_mosaic/feature_stab/db_vlvm
-
-LOCAL_CFLAGS := -O3 -DNDEBUG
-
-LOCAL_SRC_FILES := benchmark.cpp
-
-LOCAL_SHARED_LIBRARIES := libjni_mosaic libGLESv2 libEGL
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_LDFLAGS :=  -llog -lGLESv2
-
-LOCAL_MODULE := panorama_bench
-
-LOCAL_MODULE_PATH := $(local_target_dir)
-
-include $(BUILD_EXECUTABLE)
-- 
cgit v1.2.3