Update Ceres to the latest versionandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-l-preview_r2android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1l-previewkitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devidea133-weekly-releaseidea133

Bug: 10673139
Bug: 10621282

Change-Id: Ib740a6e0e29049cc203da9f083b0d4f5734a2741

1 files changed, 59 insertions, 4 deletions

diff --git a/Android.mk b/Android.mk
index 9ffd83c..7e5a993 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,55 @@
+# Ceres Solver - A fast non-linear least squares minimizer
+# Copyright 2010, 2011, 2012 Google Inc. All rights reserved.
+# http://code.google.com/p/ceres-solver/
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of Google Inc. nor the names of its contributors may be
+#   used to endorse or promote products derived from this software without
+#   specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# Author: settinger@google.com (Scott Ettinger)
+#         keir@google.com (Keir Mierle)
+#
+# Builds Ceres for Android, using the standard toolchain (not standalone). It
+# uses STLPort instead of GNU C++. This is useful for anyone wishing to ship
+# GPL-free code. This cannot build the tests or other parts of Ceres; only the
+# core libraries. If you need a more complete Ceres build, consider using the
+# CMake toolchain (noting that the standalone toolchain doesn't work with
+# STLPort).
+#
+# Reducing binary size:
+#
+# This build includes the Schur specializations, which cause binary bloat. If
+# you don't need them for your application, consider adding:
+#
+#   -DCERES_RESTRICT_SCHUR_SPECIALIZATION
+#
+# to the LOCAL_CFLAGS variable below, and commenting out all the
+# generated/schur_eliminator_2_2_2.cc-alike files, leaving only the _d_d_d one.
+#
+# Similarly if you do not need the line search minimizer, consider adding
+#
+#   -DCERES_NO_LINE_SEARCH_MINIMIZER
+
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -8,25 +60,28 @@ LOCAL_NDK_STL_VARIANT := stlport_static
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/internal \
                     $(LOCAL_PATH)/internal/ceres \
-                    $(LOCAL_PATH)/include \
                     $(LOCAL_PATH)/internal/ceres/miniglog \
-                    external/eigen
+                    $(LOCAL_PATH)/include \
+                    external/eigen \
 
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_CPPFLAGS := -DCERES_NO_PROTOCOL_BUFFERS \
+                  -DCERES_NO_LAPACK \
                   -DCERES_NO_SUITESPARSE \
                   -DCERES_NO_GFLAGS \
                   -DCERES_NO_THREADS \
                   -DCERES_NO_CXSPARSE \
                   -DCERES_NO_TR1 \
                   -DCERES_WORK_AROUND_ANDROID_NDK_COMPILER_BUG \
+                  -DMAX_LOG_LEVEL=-1 \
                   -O3 -w
 
 # On Android NDK 8b, GCC gives spurrious warnings about ABI incompatibility for
 # which there is no solution. Hide the warning instead.
-LOCAL_CPPFLAGS += -Wno-psabi
+LOCAL_CFLAGS += -Wno-psabi
 
 LOCAL_SRC_FILES := internal/ceres/array_utils.cc \
+                   internal/ceres/blas.cc \
                    internal/ceres/block_evaluate_preparer.cc \
                    internal/ceres/block_jacobian_writer.cc \
                    internal/ceres/block_jacobi_preconditioner.cc \
@@ -53,6 +108,7 @@ LOCAL_SRC_FILES := internal/ceres/array_utils.cc \
                    internal/ceres/gradient_checking_cost_function.cc \
                    internal/ceres/implicit_schur_complement.cc \
                    internal/ceres/iterative_schur_complement_solver.cc \
+                   internal/ceres/lapack.cc \
                    internal/ceres/levenberg_marquardt_strategy.cc \
                    internal/ceres/line_search.cc \
                    internal/ceres/line_search_direction.cc \
@@ -63,7 +119,6 @@ LOCAL_SRC_FILES := internal/ceres/array_utils.cc \
                    internal/ceres/local_parameterization.cc \
                    internal/ceres/loss_function.cc \
                    internal/ceres/low_rank_inverse_hessian.cc \
-                   internal/ceres/miniglog/glog/logging.cc \
                    internal/ceres/minimizer.cc \
                    internal/ceres/normal_prior.cc \
                    internal/ceres/parameter_block_ordering.cc \