From 0cc1bc5bbd2eca046e2bdc8b09be01c9ef73de7c Mon Sep 17 00:00:00 2001 From: Sameer Agarwal Date: Fri, 6 Jun 2014 15:24:03 -0700 Subject: [PATCH] Add missing files to the NDK build. Add reorder_program.cc and also fix an include error which was only triggered by the NDK build. Change-Id: Ic800687d1857be1e3d60a44b87595d59e52c1117 --- internal/ceres/reorder_program.cc | 9 +++++---- jni/Android.mk | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/ceres/reorder_program.cc b/internal/ceres/reorder_program.cc index c1afba77c..fa9e1d829 100644 --- a/internal/ceres/reorder_program.cc +++ b/internal/ceres/reorder_program.cc @@ -34,19 +34,20 @@ #include #include -#include "glog/logging.h" #include "ceres/cxsparse.h" +#include "ceres/internal/port.h" #include "ceres/ordered_groups.h" +#include "ceres/parameter_block.h" #include "ceres/parameter_block_ordering.h" #include "ceres/problem_impl.h" #include "ceres/program.h" #include "ceres/program.h" +#include "ceres/residual_block.h" #include "ceres/solver.h" #include "ceres/suitesparse.h" +#include "ceres/triplet_sparse_matrix.h" #include "ceres/types.h" -#include "ceres/internal/port.h" -#include "ceres/residual_block.h" -#include "ceres/parameter_block.h" +#include "glog/logging.h" namespace ceres { namespace internal { diff --git a/jni/Android.mk b/jni/Android.mk index eeeff5f7d..70680f578 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -158,6 +158,7 @@ LOCAL_SRC_FILES := $(CERES_SRC_PATH)/array_utils.cc \ $(CERES_SRC_PATH)/problem.cc \ $(CERES_SRC_PATH)/problem_impl.cc \ $(CERES_SRC_PATH)/program.cc \ + $(CERES_SRC_PATH)/reorder_program.cc \ $(CERES_SRC_PATH)/residual_block.cc \ $(CERES_SRC_PATH)/residual_block_utils.cc \ $(CERES_SRC_PATH)/schur_complement_solver.cc \