Commits

Jaak Laineste  committed b65cd89

Spatialite and Proj updates

  • Participants
  • Parent commits c5f0f0b

Comments (0)

Files changed (61)

File jni/Android.mk

 	proj-4.7.0/src/vector1.c 
 include $(BUILD_SHARED_LIBRARY)
 
+#include $(CLEAR_VARS)
+# Note: does not work for now, compilation terminates with ...LineString.cpp:426: internal compiler error: Bus error: 10
+# ./configure --build=x86_64-pc-linux-gnu --host=arm-linux-eabi
+# find geos-3.3.0/ -name "*.cpp" | grep -Ev "tests|doc" | sort | awk '{ print "\t"$1" \\" }'
+LOCAL_MODULE := geos
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/geos-3.3.0/include
+LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%)
+LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -ldl
+LOCAL_STL                 := gnustl_static
+LOCAL_CPPFLAGS            += -fexceptions
+LOCAL_CPPFLAGS            += -frtti
+LOCAL_CPPFLAGS            += -lsupc++ -lstdc++
+LOCAL_SRC_FILES := \
+	geos-3.3.0/capi/geos_c.cpp \
+	geos-3.3.0/capi/geos_ts_c.cpp \
+	geos-3.3.0/src/algorithm/Angle.cpp \
+	geos-3.3.0/src/algorithm/BoundaryNodeRule.cpp \
+	geos-3.3.0/src/algorithm/CGAlgorithms.cpp \
+	geos-3.3.0/src/algorithm/CentroidArea.cpp \
+	geos-3.3.0/src/algorithm/CentroidLine.cpp \
+	geos-3.3.0/src/algorithm/CentroidPoint.cpp \
+	geos-3.3.0/src/algorithm/ConvexHull.cpp \
+	geos-3.3.0/src/algorithm/HCoordinate.cpp \
+	geos-3.3.0/src/algorithm/InteriorPointArea.cpp \
+	geos-3.3.0/src/algorithm/InteriorPointLine.cpp \
+	geos-3.3.0/src/algorithm/InteriorPointPoint.cpp \
+	geos-3.3.0/src/algorithm/LineIntersector.cpp \
+	geos-3.3.0/src/algorithm/MCPointInRing.cpp \
+	geos-3.3.0/src/algorithm/MinimumDiameter.cpp \
+	geos-3.3.0/src/algorithm/NotRepresentableException.cpp \
+	geos-3.3.0/src/algorithm/PointLocator.cpp \
+	geos-3.3.0/src/algorithm/RayCrossingCounter.cpp \
+	geos-3.3.0/src/algorithm/RobustDeterminant.cpp \
+	geos-3.3.0/src/algorithm/SIRtreePointInRing.cpp \
+	geos-3.3.0/src/algorithm/SimplePointInRing.cpp \
+	geos-3.3.0/src/algorithm/distance/DiscreteHausdorffDistance.cpp \
+	geos-3.3.0/src/algorithm/distance/DistanceToPoint.cpp \
+	geos-3.3.0/src/algorithm/locate/IndexedPointInAreaLocator.cpp \
+	geos-3.3.0/src/algorithm/locate/PointOnGeometryLocator.cpp \
+	geos-3.3.0/src/algorithm/locate/SimplePointInAreaLocator.cpp \
+	geos-3.3.0/src/geom/Coordinate.cpp \
+	geos-3.3.0/src/geom/CoordinateArraySequence.cpp \
+	geos-3.3.0/src/geom/CoordinateArraySequenceFactory.cpp \
+	geos-3.3.0/src/geom/CoordinateSequence.cpp \
+	geos-3.3.0/src/geom/CoordinateSequenceFactory.cpp \
+	geos-3.3.0/src/geom/Dimension.cpp \
+	geos-3.3.0/src/geom/Envelope.cpp \
+	geos-3.3.0/src/geom/Geometry.cpp \
+	geos-3.3.0/src/geom/GeometryCollection.cpp \
+	geos-3.3.0/src/geom/GeometryComponentFilter.cpp \
+	geos-3.3.0/src/geom/GeometryFactory.cpp \
+	geos-3.3.0/src/geom/GeometryList.cpp \
+	geos-3.3.0/src/geom/IntersectionMatrix.cpp \
+	geos-3.3.0/src/geom/LineSegment.cpp \
+	geos-3.3.0/src/geom/LineString.cpp \
+	geos-3.3.0/src/geom/LinearRing.cpp \
+	geos-3.3.0/src/geom/Location.cpp \
+	geos-3.3.0/src/geom/MultiLineString.cpp \
+	geos-3.3.0/src/geom/MultiPoint.cpp \
+	geos-3.3.0/src/geom/MultiPolygon.cpp \
+	geos-3.3.0/src/geom/Point.cpp \
+	geos-3.3.0/src/geom/Polygon.cpp \
+	geos-3.3.0/src/geom/PrecisionModel.cpp \
+	geos-3.3.0/src/geom/Triangle.cpp \
+	geos-3.3.0/src/geom/prep/AbstractPreparedPolygonContains.cpp \
+	geos-3.3.0/src/geom/prep/BasicPreparedGeometry.cpp \
+	geos-3.3.0/src/geom/prep/PreparedGeometry.cpp \
+	geos-3.3.0/src/geom/prep/PreparedGeometryFactory.cpp \
+	geos-3.3.0/src/geom/prep/PreparedLineString.cpp \
+	geos-3.3.0/src/geom/prep/PreparedLineStringIntersects.cpp \
+	geos-3.3.0/src/geom/prep/PreparedPoint.cpp \
+	geos-3.3.0/src/geom/prep/PreparedPolygon.cpp \
+	geos-3.3.0/src/geom/prep/PreparedPolygonContains.cpp \
+	geos-3.3.0/src/geom/prep/PreparedPolygonContainsProperly.cpp \
+	geos-3.3.0/src/geom/prep/PreparedPolygonCovers.cpp \
+	geos-3.3.0/src/geom/prep/PreparedPolygonIntersects.cpp \
+	geos-3.3.0/src/geom/prep/PreparedPolygonPredicate.cpp \
+	geos-3.3.0/src/geom/util/ComponentCoordinateExtracter.cpp \
+	geos-3.3.0/src/geom/util/CoordinateOperation.cpp \
+	geos-3.3.0/src/geom/util/GeometryCombiner.cpp \
+	geos-3.3.0/src/geom/util/GeometryEditor.cpp \
+	geos-3.3.0/src/geom/util/GeometryTransformer.cpp \
+	geos-3.3.0/src/geom/util/ShortCircuitedGeometryVisitor.cpp \
+	geos-3.3.0/src/geom/util/SineStarFactory.cpp \
+	geos-3.3.0/src/geomgraph/Depth.cpp \
+	geos-3.3.0/src/geomgraph/DirectedEdge.cpp \
+	geos-3.3.0/src/geomgraph/DirectedEdgeStar.cpp \
+	geos-3.3.0/src/geomgraph/Edge.cpp \
+	geos-3.3.0/src/geomgraph/EdgeEnd.cpp \
+	geos-3.3.0/src/geomgraph/EdgeEndStar.cpp \
+	geos-3.3.0/src/geomgraph/EdgeIntersectionList.cpp \
+	geos-3.3.0/src/geomgraph/EdgeList.cpp \
+	geos-3.3.0/src/geomgraph/EdgeNodingValidator.cpp \
+	geos-3.3.0/src/geomgraph/EdgeRing.cpp \
+	geos-3.3.0/src/geomgraph/GeometryGraph.cpp \
+	geos-3.3.0/src/geomgraph/GraphComponent.cpp \
+	geos-3.3.0/src/geomgraph/Label.cpp \
+	geos-3.3.0/src/geomgraph/Node.cpp \
+	geos-3.3.0/src/geomgraph/NodeFactory.cpp \
+	geos-3.3.0/src/geomgraph/NodeMap.cpp \
+	geos-3.3.0/src/geomgraph/PlanarGraph.cpp \
+	geos-3.3.0/src/geomgraph/Position.cpp \
+	geos-3.3.0/src/geomgraph/Quadrant.cpp \
+	geos-3.3.0/src/geomgraph/TopologyLocation.cpp \
+	geos-3.3.0/src/geomgraph/index/MonotoneChainEdge.cpp \
+	geos-3.3.0/src/geomgraph/index/MonotoneChainIndexer.cpp \
+	geos-3.3.0/src/geomgraph/index/SegmentIntersector.cpp \
+	geos-3.3.0/src/geomgraph/index/SimpleEdgeSetIntersector.cpp \
+	geos-3.3.0/src/geomgraph/index/SimpleMCSweepLineIntersector.cpp \
+	geos-3.3.0/src/geomgraph/index/SimpleSweepLineIntersector.cpp \
+	geos-3.3.0/src/geomgraph/index/SweepLineEvent.cpp \
+	geos-3.3.0/src/geomgraph/index/SweepLineSegment.cpp \
+	geos-3.3.0/src/index/bintree/Bintree.cpp \
+	geos-3.3.0/src/index/bintree/Interval.cpp \
+	geos-3.3.0/src/index/bintree/Key.cpp \
+	geos-3.3.0/src/index/bintree/Node.cpp \
+	geos-3.3.0/src/index/bintree/NodeBase.cpp \
+	geos-3.3.0/src/index/bintree/Root.cpp \
+	geos-3.3.0/src/index/chain/MonotoneChain.cpp \
+	geos-3.3.0/src/index/chain/MonotoneChainBuilder.cpp \
+	geos-3.3.0/src/index/chain/MonotoneChainOverlapAction.cpp \
+	geos-3.3.0/src/index/chain/MonotoneChainSelectAction.cpp \
+	geos-3.3.0/src/index/intervalrtree/IntervalRTreeBranchNode.cpp \
+	geos-3.3.0/src/index/intervalrtree/IntervalRTreeLeafNode.cpp \
+	geos-3.3.0/src/index/intervalrtree/IntervalRTreeNode.cpp \
+	geos-3.3.0/src/index/intervalrtree/SortedPackedIntervalRTree.cpp \
+	geos-3.3.0/src/index/quadtree/DoubleBits.cpp \
+	geos-3.3.0/src/index/quadtree/IntervalSize.cpp \
+	geos-3.3.0/src/index/quadtree/Key.cpp \
+	geos-3.3.0/src/index/quadtree/Node.cpp \
+	geos-3.3.0/src/index/quadtree/NodeBase.cpp \
+	geos-3.3.0/src/index/quadtree/Quadtree.cpp \
+	geos-3.3.0/src/index/quadtree/Root.cpp \
+	geos-3.3.0/src/index/strtree/AbstractNode.cpp \
+	geos-3.3.0/src/index/strtree/AbstractSTRtree.cpp \
+	geos-3.3.0/src/index/strtree/Interval.cpp \
+	geos-3.3.0/src/index/strtree/ItemBoundable.cpp \
+	geos-3.3.0/src/index/strtree/SIRtree.cpp \
+	geos-3.3.0/src/index/strtree/STRtree.cpp \
+	geos-3.3.0/src/index/sweepline/SweepLineEvent.cpp \
+	geos-3.3.0/src/index/sweepline/SweepLineIndex.cpp \
+	geos-3.3.0/src/index/sweepline/SweepLineInterval.cpp \
+	geos-3.3.0/src/inlines.cpp \
+	geos-3.3.0/src/io/ByteOrderDataInStream.cpp \
+	geos-3.3.0/src/io/ByteOrderValues.cpp \
+	geos-3.3.0/src/io/CLocalizer.cpp \
+	geos-3.3.0/src/io/ParseException.cpp \
+	geos-3.3.0/src/io/StringTokenizer.cpp \
+	geos-3.3.0/src/io/Unload.cpp \
+	geos-3.3.0/src/io/WKBReader.cpp \
+	geos-3.3.0/src/io/WKBWriter.cpp \
+	geos-3.3.0/src/io/WKTReader.cpp \
+	geos-3.3.0/src/io/WKTWriter.cpp \
+	geos-3.3.0/src/io/Writer.cpp \
+	geos-3.3.0/src/linearref/ExtractLineByLocation.cpp \
+	geos-3.3.0/src/linearref/LengthIndexOfPoint.cpp \
+	geos-3.3.0/src/linearref/LengthIndexedLine.cpp \
+	geos-3.3.0/src/linearref/LengthLocationMap.cpp \
+	geos-3.3.0/src/linearref/LinearGeometryBuilder.cpp \
+	geos-3.3.0/src/linearref/LinearIterator.cpp \
+	geos-3.3.0/src/linearref/LinearLocation.cpp \
+	geos-3.3.0/src/linearref/LocationIndexOfLine.cpp \
+	geos-3.3.0/src/linearref/LocationIndexOfPoint.cpp \
+	geos-3.3.0/src/noding/BasicSegmentString.cpp \
+	geos-3.3.0/src/noding/FastNodingValidator.cpp \
+	geos-3.3.0/src/noding/FastSegmentSetIntersectionFinder.cpp \
+	geos-3.3.0/src/noding/IntersectionAdder.cpp \
+	geos-3.3.0/src/noding/IntersectionFinderAdder.cpp \
+	geos-3.3.0/src/noding/IteratedNoder.cpp \
+	geos-3.3.0/src/noding/MCIndexNoder.cpp \
+	geos-3.3.0/src/noding/MCIndexSegmentSetMutualIntersector.cpp \
+	geos-3.3.0/src/noding/NodedSegmentString.cpp \
+	geos-3.3.0/src/noding/NodingValidator.cpp \
+	geos-3.3.0/src/noding/Octant.cpp \
+	geos-3.3.0/src/noding/OrientedCoordinateArray.cpp \
+	geos-3.3.0/src/noding/ScaledNoder.cpp \
+	geos-3.3.0/src/noding/SegmentIntersectionDetector.cpp \
+	geos-3.3.0/src/noding/SegmentNode.cpp \
+	geos-3.3.0/src/noding/SegmentNodeList.cpp \
+	geos-3.3.0/src/noding/SegmentString.cpp \
+	geos-3.3.0/src/noding/SegmentStringUtil.cpp \
+	geos-3.3.0/src/noding/SimpleNoder.cpp \
+	geos-3.3.0/src/noding/SingleInteriorIntersectionFinder.cpp \
+	geos-3.3.0/src/noding/snapround/HotPixel.cpp \
+	geos-3.3.0/src/noding/snapround/MCIndexPointSnapper.cpp \
+	geos-3.3.0/src/noding/snapround/MCIndexSnapRounder.cpp \
+	geos-3.3.0/src/noding/snapround/SimpleSnapRounder.cpp \
+	geos-3.3.0/src/operation/GeometryGraphOperation.cpp \
+	geos-3.3.0/src/operation/IsSimpleOp.cpp \
+	geos-3.3.0/src/operation/buffer/BufferBuilder.cpp \
+	geos-3.3.0/src/operation/buffer/BufferInputLineSimplifier.cpp \
+	geos-3.3.0/src/operation/buffer/BufferOp.cpp \
+	geos-3.3.0/src/operation/buffer/BufferParameters.cpp \
+	geos-3.3.0/src/operation/buffer/BufferSubgraph.cpp \
+	geos-3.3.0/src/operation/buffer/OffsetCurveBuilder.cpp \
+	geos-3.3.0/src/operation/buffer/OffsetCurveSetBuilder.cpp \
+	geos-3.3.0/src/operation/buffer/OffsetSegmentGenerator.cpp \
+	geos-3.3.0/src/operation/buffer/RightmostEdgeFinder.cpp \
+	geos-3.3.0/src/operation/buffer/SubgraphDepthLocater.cpp \
+	geos-3.3.0/src/operation/distance/ConnectedElementLocationFilter.cpp \
+	geos-3.3.0/src/operation/distance/ConnectedElementPointFilter.cpp \
+	geos-3.3.0/src/operation/distance/DistanceOp.cpp \
+	geos-3.3.0/src/operation/distance/GeometryLocation.cpp \
+	geos-3.3.0/src/operation/linemerge/EdgeString.cpp \
+	geos-3.3.0/src/operation/linemerge/LineMergeDirectedEdge.cpp \
+	geos-3.3.0/src/operation/linemerge/LineMergeEdge.cpp \
+	geos-3.3.0/src/operation/linemerge/LineMergeGraph.cpp \
+	geos-3.3.0/src/operation/linemerge/LineMerger.cpp \
+	geos-3.3.0/src/operation/linemerge/LineSequencer.cpp \
+	geos-3.3.0/src/operation/overlay/EdgeSetNoder.cpp \
+	geos-3.3.0/src/operation/overlay/ElevationMatrix.cpp \
+	geos-3.3.0/src/operation/overlay/ElevationMatrixCell.cpp \
+	geos-3.3.0/src/operation/overlay/LineBuilder.cpp \
+	geos-3.3.0/src/operation/overlay/MaximalEdgeRing.cpp \
+	geos-3.3.0/src/operation/overlay/MinimalEdgeRing.cpp \
+	geos-3.3.0/src/operation/overlay/OverlayNodeFactory.cpp \
+	geos-3.3.0/src/operation/overlay/OverlayOp.cpp \
+	geos-3.3.0/src/operation/overlay/PointBuilder.cpp \
+	geos-3.3.0/src/operation/overlay/PolygonBuilder.cpp \
+	geos-3.3.0/src/operation/overlay/snap/GeometrySnapper.cpp \
+	geos-3.3.0/src/operation/overlay/snap/LineStringSnapper.cpp \
+	geos-3.3.0/src/operation/overlay/snap/SnapIfNeededOverlayOp.cpp \
+	geos-3.3.0/src/operation/overlay/snap/SnapOverlayOp.cpp \
+	geos-3.3.0/src/operation/overlay/validate/FuzzyPointLocator.cpp \
+	geos-3.3.0/src/operation/overlay/validate/OffsetPointGenerator.cpp \
+	geos-3.3.0/src/operation/overlay/validate/OverlayResultValidator.cpp \
+	geos-3.3.0/src/operation/polygonize/EdgeRing.cpp \
+	geos-3.3.0/src/operation/polygonize/PolygonizeDirectedEdge.cpp \
+	geos-3.3.0/src/operation/polygonize/PolygonizeEdge.cpp \
+	geos-3.3.0/src/operation/polygonize/PolygonizeGraph.cpp \
+	geos-3.3.0/src/operation/polygonize/Polygonizer.cpp \
+	geos-3.3.0/src/operation/predicate/RectangleContains.cpp \
+	geos-3.3.0/src/operation/predicate/RectangleIntersects.cpp \
+	geos-3.3.0/src/operation/predicate/SegmentIntersectionTester.cpp \
+	geos-3.3.0/src/operation/relate/EdgeEndBuilder.cpp \
+	geos-3.3.0/src/operation/relate/EdgeEndBundle.cpp \
+	geos-3.3.0/src/operation/relate/EdgeEndBundleStar.cpp \
+	geos-3.3.0/src/operation/relate/RelateComputer.cpp \
+	geos-3.3.0/src/operation/relate/RelateNode.cpp \
+	geos-3.3.0/src/operation/relate/RelateNodeFactory.cpp \
+	geos-3.3.0/src/operation/relate/RelateNodeGraph.cpp \
+	geos-3.3.0/src/operation/relate/RelateOp.cpp \
+	geos-3.3.0/src/operation/sharedpaths/SharedPathsOp.cpp \
+	geos-3.3.0/src/operation/union/CascadedPolygonUnion.cpp \
+	geos-3.3.0/src/operation/union/CascadedUnion.cpp \
+	geos-3.3.0/src/operation/union/PointGeometryUnion.cpp \
+	geos-3.3.0/src/operation/union/UnaryUnionOp.cpp \
+	geos-3.3.0/src/operation/valid/ConnectedInteriorTester.cpp \
+	geos-3.3.0/src/operation/valid/ConsistentAreaTester.cpp \
+	geos-3.3.0/src/operation/valid/IndexedNestedRingTester.cpp \
+	geos-3.3.0/src/operation/valid/IsValidOp.cpp \
+	geos-3.3.0/src/operation/valid/QuadtreeNestedRingTester.cpp \
+	geos-3.3.0/src/operation/valid/RepeatedPointTester.cpp \
+	geos-3.3.0/src/operation/valid/SimpleNestedRingTester.cpp \
+	geos-3.3.0/src/operation/valid/SweeplineNestedRingTester.cpp \
+	geos-3.3.0/src/operation/valid/TopologyValidationError.cpp \
+	geos-3.3.0/src/planargraph/DirectedEdge.cpp \
+	geos-3.3.0/src/planargraph/DirectedEdgeStar.cpp \
+	geos-3.3.0/src/planargraph/Edge.cpp \
+	geos-3.3.0/src/planargraph/Node.cpp \
+	geos-3.3.0/src/planargraph/NodeMap.cpp \
+	geos-3.3.0/src/planargraph/PlanarGraph.cpp \
+	geos-3.3.0/src/planargraph/Subgraph.cpp \
+	geos-3.3.0/src/planargraph/algorithm/ConnectedSubgraphFinder.cpp \
+	geos-3.3.0/src/precision/CommonBits.cpp \
+	geos-3.3.0/src/precision/CommonBitsOp.cpp \
+	geos-3.3.0/src/precision/CommonBitsRemover.cpp \
+	geos-3.3.0/src/precision/EnhancedPrecisionOp.cpp \
+	geos-3.3.0/src/precision/SimpleGeometryPrecisionReducer.cpp \
+	geos-3.3.0/src/simplify/DouglasPeuckerLineSimplifier.cpp \
+	geos-3.3.0/src/simplify/DouglasPeuckerSimplifier.cpp \
+	geos-3.3.0/src/simplify/LineSegmentIndex.cpp \
+	geos-3.3.0/src/simplify/TaggedLineSegment.cpp \
+	geos-3.3.0/src/simplify/TaggedLineString.cpp \
+	geos-3.3.0/src/simplify/TaggedLineStringSimplifier.cpp \
+	geos-3.3.0/src/simplify/TaggedLinesSimplifier.cpp \
+	geos-3.3.0/src/simplify/TopologyPreservingSimplifier.cpp \
+	geos-3.3.0/src/util/Assert.cpp \
+	geos-3.3.0/src/util/GeometricShapeFactory.cpp \
+	geos-3.3.0/src/util/Profiler.cpp \
+	geos-3.3.0/src/util/math.cpp
+#include $(BUILD_STATIC_LIBRARY)
+
 include $(CLEAR_VARS)
 # ./configure --build=x86_64-pc-linux-gnu --host=arm-linux-eabi
 # find geos-3.2.2/ -name "*.cpp" | grep -Ev "tests|doc" | sort | awk '{ print "\t"$1" \\" }'
 	geos-3.2.2/source/util/Profiler.cpp
 include $(BUILD_STATIC_LIBRARY)
 
+
 include $(CLEAR_VARS)
 # -DOMIT_GEOS=0
 # ./configure --build=x86_64-pc-linux-gnu --host=arm-linux-eabi
 LOCAL_MODULE    := spatialite
-LOCAL_CFLAGS    := -D__ANDROID__ -Dfdatasync=fsync -DOMIT_GEOCALLBACKS -DSQLITE_ENABLE_RTREE
+LOCAL_CFLAGS    := -D__ANDROID__ -Dfdatasync=fsync -DSQLITE_ENABLE_RTREE -DOMIT_FREEXL
 LOCAL_LDLIBS	:= -llog 
 LOCAL_C_INCLUDES := \
     libiconv-1.13.1/include \
     libiconv-1.13.1/libcharset/include \
     geos-3.2.2/source/headers \
     geos-3.2.2/capi \
-    proj-4.6.1/src
+    proj-4.7.0/src
 LOCAL_SRC_FILES := \
-    ./libspatialite-amalgamation-2.4.0/spatialite.c \
-    ./libspatialite-amalgamation-2.4.0/empty.cpp \
-    ./libspatialite-amalgamation-2.4.0/sqlite3.c
+    ./libspatialite-amalgamation-3.0.0-beta/spatialite.c \
+    ./libspatialite-amalgamation-3.0.0-beta/empty.cpp \
+    ./libspatialite-amalgamation-3.0.0-beta/sqlite3.c
 LOCAL_STATIC_LIBRARIES := iconv geos proj
 include $(BUILD_STATIC_LIBRARY)
 
 	-Dfdatasync=fsync
 LOCAL_LDLIBS	:= -llog
 LOCAL_C_INCLUDES := \
-	$(LOCAL_PATH)/libspatialite-amalgamation-2.4.0/headers/spatialite \
+	$(LOCAL_PATH)/libspatialite-amalgamation-3.0.0-beta/headers/spatialite \
 	$(LOCAL_PATH)/javasqlite-20110106/native/
 LOCAL_SRC_FILES := \
 	javasqlite-20110106/native/sqlite_jni.c \
 	javasqlite-20110106/native/empty.cpp \
-	libspatialite-amalgamation-2.4.0/sqlite3.c
+	libspatialite-amalgamation-3.0.0-beta/sqlite3.c
 LOCAL_STATIC_LIBRARIES := spatialite iconv geos proj
 include $(BUILD_SHARED_LIBRARY)

File jni/libspatialite-amalgamation-2.4.0/.svn/all-wcprops

-K 25
-svn:wc:ra_dav:version-url
-V 58
-/svn/!svn/ver/2/trunk/jni/libspatialite-amalgamation-2.4.0
-END
-empty.cpp
-K 25
-svn:wc:ra_dav:version-url
-V 68
-/svn/!svn/ver/2/trunk/jni/libspatialite-amalgamation-2.4.0/empty.cpp
-END
-spatialite.c
-K 25
-svn:wc:ra_dav:version-url
-V 71
-/svn/!svn/ver/2/trunk/jni/libspatialite-amalgamation-2.4.0/spatialite.c
-END
-libspatialite.def
-K 25
-svn:wc:ra_dav:version-url
-V 76
-/svn/!svn/ver/2/trunk/jni/libspatialite-amalgamation-2.4.0/libspatialite.def
-END
-sqlite3.c
-K 25
-svn:wc:ra_dav:version-url
-V 68
-/svn/!svn/ver/2/trunk/jni/libspatialite-amalgamation-2.4.0/sqlite3.c
-END

File jni/libspatialite-amalgamation-2.4.0/.svn/entries

-10
-
-dir
-4
-http://spatialite-android.googlecode.com/svn/trunk/jni/libspatialite-amalgamation-2.4.0
-http://spatialite-android.googlecode.com/svn
-
-
-
-2011-05-25T13:11:49.131514Z
-2
-efrohnho
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4f45a243-7bfc-1221-abe5-f9858998eb47
-
-empty.cpp
-file
-
-
-
-
-2011-06-23T11:41:08.000000Z
-d41d8cd98f00b204e9800998ecf8427e
-2011-05-25T13:11:49.131514Z
-2
-efrohnho
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-0
-
-spatialite.c
-file
-
-
-
-
-2011-06-23T11:41:08.000000Z
-37f2b60e94c60c76a10e1e45c7236a0f
-2011-05-25T13:11:49.131514Z
-2
-efrohnho
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6791201
-
-libspatialite.def
-file
-
-
-
-
-2011-06-23T11:41:08.000000Z
-9826c721a06521a975649e89806ee689
-2011-05-25T13:11:49.131514Z
-2
-efrohnho
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9378
-
-sqlite3.c
-file
-
-
-
-
-2011-06-23T11:41:08.000000Z
-d73017827e04161bc6393790c2f63a53
-2011-05-25T13:11:49.131514Z
-2
-efrohnho
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4256990
-
-headers
-dir
-

File jni/libspatialite-amalgamation-2.4.0/.svn/text-base/empty.cpp.svn-base

Empty file removed.

File jni/libspatialite-amalgamation-2.4.0/.svn/text-base/libspatialite.def.svn-base

-LIBRARY spatialite.dll
-EXPORTS
-gaiaAllocShapefile
-gaiaAllocDbf
-gaiaAllocDbfList
-gaiaCloneDbfEntity
-gaiaAddLinestringToGeomColl
-gaiaAppendPointToDynamicLine
-gaiaPrependPointToDynamicLine
-gaiaReverseDynamicLine
-gaiaDynamicLineSplitBefore
-gaiaDynamicLineSplitAfter
-gaiaDynamicLineJoinAfter
-gaiaDynamicLineJoinBefore
-gaiaGeomCollSimplify
-gaiaGeomCollSimplifyPreserveTopology
-gaiaGetLocaleCharset
-gaiaConvertCharset
-gaiaCreateUTF8Converter
-gaiaFreeUTF8Converter
-gaiaConvertToUTF8
-gaiaIsReservedSqliteName
-gaiaIsReservedSqlName
-gaiaIllegalSqlName
-gaiaCleanSqlString
-gaiaEndianArch
-gaiaImport16
-gaiaImport32
-gaiaImportF32
-gaiaImport64
-gaiaImportI64
-gaiaExport16
-gaiaExport32
-gaiaExportF32
-gaiaExport64
-gaiaExportI64
-gaiaAllocPoint
-gaiaAllocPointXYZ
-gaiaAllocPointXYM
-gaiaAllocPointXYZM
-gaiaFreePoint
-gaiaAllocLinestring
-gaiaAllocLinestringXYZ
-gaiaAllocLinestringXYM
-gaiaAllocLinestringXYZM
-gaiaFreeLinestring
-gaiaCopyLinestringCoords
-gaiaAllocRing
-gaiaAllocRingXYZ
-gaiaAllocRingXYM
-gaiaAllocRingXYZM
-gaiaFreeRing
-gaiaCopyRingCoords
-gaiaAllocPolygon
-gaiaAllocPolygonXYZ
-gaiaAllocPolygonXYM
-gaiaAllocPolygonXYZM
-gaiaCreatePolygon
-gaiaFreePolygon
-gaiaAllocGeomColl
-gaiaAllocGeomCollXYZ
-gaiaAllocGeomCollXYM
-gaiaAllocGeomCollXYZM
-gaiaFreeGeomColl
-gaiaAddPointToGeomColl
-gaiaAddPointToGeomCollXYZ
-gaiaAddPointToGeomCollXYM
-gaiaAddPointToGeomCollXYZM
-gaiaMbrLinestring
-gaiaMbrRing
-gaiaMbrPolygon
-gaiaMbrGeometry
-gaiaZRangeLinestring
-gaiaZRangeRing
-gaiaZRangePolygon
-gaiaZRangeGeometry
-gaiaMRangeLinestring
-gaiaMRangeRing
-gaiaMRangePolygon
-gaiaMRangeGeometry
-gaiaInsertLinestringInGeomColl
-gaiaAddPolygonToGeomColl
-gaiaInsertPolygonInGeomColl
-gaiaAddInteriorRing
-gaiaInsertInteriorRing
-gaiaAddRingToPolyg
-gaiaAllocDynamicLine
-gaiaFreeDynamicLine
-gaiaDynamicLineInsertAfter
-gaiaDynamicLineInsertBefore
-gaiaDynamicLineDeletePoint
-gaiaCloneDynamicLine
-gaiaDynamicLineFindByCoords
-gaiaDynamicLineFindByPos
-gaiaCreateDynamicLine
-gaiaMeasureLength
-gaiaMeasureArea
-gaiaRingCentroid
-gaiaClockwise
-gaiaIsPointOnRingSurface
-gaiaMinDistance
-gaiaIsPointOnPolygonSurface
-gaiaIntersect
-gaiaFromSpatiaLiteBlobWkb
-gaiaToSpatiaLiteBlobWkb
-gaiaToCompressedBlobWkb
-gaiaFromSpatiaLiteBlobMbr
-gaiaFromWkb
-gaiaToWkb
-gaiaToHexWkb
-gaiaFreeValue
-gaiaSetNullValue
-gaiaSetIntValue
-gaiaSetDoubleValue
-gaiaSetStrValue
-gaiaAllocDbfField
-gaiaFreeDbfField
-gaiaCloneDbfField
-gaiaFreeDbfList
-gaiaIsValidDbfList
-gaiaAddDbfField
-gaiaResetDbfEntity
-gaiaCloneValue
-gaiaFreeShapefile
-gaiaOpenShpRead
-gaiaOpenShpWrite
-gaiaReadShpEntity
-gaiaShpAnalyze
-gaiaWriteShpEntity
-gaiaFlushShpHeaders
-gaiaFreeDbf
-gaiaOpenDbfRead
-gaiaReadDbfEntity
-gaiaParseWkt
-gaiaOutWkt
-gaiaOutSvg
-gaiaOutBareKml
-gaiaOutFullKml
-gaiaOutGml
-gaiaFromFgf
-gaiaToFgf
-gaiaDimension
-gaiaGeometryType
-gaiaGeometryAliasType
-gaiaIsEmpty
-gaiaMbrsContains
-gaiaMbrsDisjoint
-gaiaMbrsEqual
-gaiaMbrsIntersects
-gaiaMbrsOverlaps
-gaiaMbrsTouches
-gaiaMbrsWithin
-gaiaShiftCoords
-gaiaScaleCoords
-gaiaRotateCoords
-gaiaReflectCoords
-gaiaSwapCoords
-gaiaCastGeomCollToXY
-gaiaCastGeomCollToXYZ
-gaiaCastGeomCollToXYM
-gaiaCastGeomCollToXYZM
-gaiaCloneGeomColl
-gaiaCloneLinestring
-gaiaCloneRing
-gaiaClonePolygon
-gaiaLinestringEquals
-gaiaPolygonEquals
-gaiaMakePoint
-gaiaBuildMbr
-gaiaBuildFilterMbr
-gaiaParseFilterMbr
-gaiaBuildCircleMbr
-gaiaGetMbrMinX
-gaiaGetMbrMaxX
-gaiaGetMbrMinY
-gaiaGetMbrMaxY
-gaiaBuildRings
-gaiaFree
-gaiaEllipseParams
-gaiaGreatCircleDistance
-gaiaGeodesicDistance
-gaiaGreatCircleTotalLength
-gaiaGeodesicTotalLength
-gaiaConvertLength
-gaiaLineGetPoint
-gaiaLineSetPoint
-gaiaRingGetPoint
-gaiaRingSetPoint
-gaiaSanitize
-gaiaIsToxic
-gaiaOutBufferInitialize
-gaiaOutBufferReset
-gaiaAppendToOutBuffer
-gaiaRadsToDegs
-gaiaDegsToRads
-gaiaTransform
-gaiaResetGeosMsg
-gaiaGetGeosErrorMsg
-gaiaGetGeosWarningMsg
-gaiaSetGeosErrorMsg
-gaiaSetGeosWarningMsg
-gaiaGeomCollEquals
-gaiaGeomCollDisjoint
-gaiaGeomCollIntersects
-gaiaGeomCollOverlaps
-gaiaGeomCollCrosses
-gaiaGeomCollContains
-gaiaGeomCollWithin
-gaiaGeomCollTouches
-gaiaGeomCollRelate
-gaiaGeomCollDistance
-gaiaGeometryIntersection
-gaiaGeometryUnion
-gaiaGeometryDifference
-gaiaGeometrySymDifference
-gaiaBoundary
-gaiaGeomCollCentroid
-gaiaGetPointOnSurface
-gaiaGeomCollSimplify
-gaiaGeomCollLength
-gaiaGeomCollArea
-gaiaIsSimple
-gaiaIsClosed
-gaiaIsRing
-gaiaIsValid
-gaiaConvexHull
-gaiaGeomCollBuffer
-gaiaPolygonize
-gaiaToGeos
-gaiaFromGeos_XY
-gaiaFromGeos_XYZ
-gaiaFromGeos_XYM
-gaiaFromGeos_XYZM
-gaiaTextReaderDestroy
-gaiaTextReaderParse
-gaiaTextReaderGetRow
-gaiaTextReaderFetchField
-gaiaGetExifTags
-gaiaExifTagsFree
-gaiaGetExifTagsCount
-gaiaGetExifTagByPos
-gaiaGetExifTagById
-gaiaGetExifGpsTagById
-gaiaGetExifTagByName
-gaiaExifTagGetId
-gaiaExifTagGetName
-gaiaIsExifGpsTag
-gaiaExifTagGetValueType
-gaiaExifTagGetNumValues
-gaiaExifTagGetByteValue
-gaiaExifTagGetStringValue
-gaiaExifTagGetShortValue
-gaiaExifTagGetLongValue
-gaiaExifTagGetRational1Value
-gaiaExifTagGetRational2Value
-gaiaExifTagGetRationalValue
-gaiaExifTagGetSignedShortValue
-gaiaExifTagGetSignedLongValue
-gaiaExifTagGetSignedRational1Value
-gaiaExifTagGetSignedRational2Value
-gaiaExifTagGetSignedRationalValue
-gaiaExifTagGetFloatValue
-gaiaExifTagGetDoubleValue
-gaiaExifTagGetHumanReadable
-gaiaGuessBlobType
-gaiaGetGpsCoords
-gaiaGetGpsLatLong
-spatialite_version
-spatialite_init
-math_round
-math_llabs
-spatial_ref_sys_init
-SPLite3_version
-SPLite3_libversion
-SPLite3_sourceid
-SPLite3_libversion_number
-SPLite3_compileoption_used
-SPLite3_compileoption_get
-SPLite3_threadsafe
-SPLite3_close
-SPLite3_exec
-SPLite3_initialize
-SPLite3_shutdown
-SPLite3_os_init
-SPLite3_os_end
-SPLite3_config
-SPLite3_db_config
-SPLite3_extended_result_codes
-SPLite3_last_insert_rowid
-SPLite3_changes
-SPLite3_total_changes
-SPLite3_interrupt
-SPLite3_complete
-SPLite3_complete16
-SPLite3_busy_handler
-SPLite3_busy_timeout
-SPLite3_get_table
-SPLite3_free_table
-SPLite3_mprintf
-SPLite3_vmprintf
-SPLite3_snprintf
-SPLite3_malloc
-SPLite3_realloc
-SPLite3_free
-SPLite3_memory_used
-SPLite3_memory_highwater
-SPLite3_randomness
-SPLite3_set_authorizer
-SPLite3_trace
-SPLite3_progress_handler
-SPLite3_open
-SPLite3_open16
-SPLite3_open_v2
-SPLite3_errcode
-SPLite3_extended_errcode
-SPLite3_errmsg
-SPLite3_errmsg16
-SPLite3_limit
-SPLite3_prepare
-SPLite3_prepare_v2
-SPLite3_prepare16
-SPLite3_prepare16_v2
-SPLite3_sql
-SPLite3_bind_blob
-SPLite3_bind_double
-SPLite3_bind_int
-SPLite3_bind_int64
-SPLite3_bind_null
-SPLite3_bind_text
-SPLite3_bind_text16
-SPLite3_bind_value
-SPLite3_bind_zeroblob
-SPLite3_bind_parameter_count
-SPLite3_bind_parameter_name
-SPLite3_bind_parameter_index
-SPLite3_clear_bindings
-SPLite3_column_count
-SPLite3_column_name
-SPLite3_column_name16
-SPLite3_column_decltype
-SPLite3_column_decltype16
-SPLite3_step
-SPLite3_data_count
-SPLite3_column_blob
-SPLite3_column_bytes
-SPLite3_column_bytes16
-SPLite3_column_double
-SPLite3_column_int
-SPLite3_column_int64
-SPLite3_column_text
-SPLite3_column_text16
-SPLite3_column_type
-SPLite3_column_value
-SPLite3_finalize
-SPLite3_reset
-SPLite3_create_function
-SPLite3_create_function16
-SPLite3_value_blob
-SPLite3_value_bytes
-SPLite3_value_bytes16
-SPLite3_value_double
-SPLite3_value_int
-SPLite3_value_int64
-SPLite3_value_text
-SPLite3_value_text16
-SPLite3_value_text16le
-SPLite3_value_text16be
-SPLite3_value_type
-SPLite3_value_numeric_type
-SPLite3_aggregate_context
-SPLite3_user_data
-SPLite3_context_db_handle
-SPLite3_get_auxdata
-SPLite3_set_auxdata
-SPLite3_result_blob
-SPLite3_result_double
-SPLite3_result_error
-SPLite3_result_error16
-SPLite3_result_error_toobig
-SPLite3_result_error_nomem
-SPLite3_result_error_code
-SPLite3_result_int
-SPLite3_result_int64
-SPLite3_result_null
-SPLite3_result_text
-SPLite3_result_text16
-SPLite3_result_text16le
-SPLite3_result_text16be
-SPLite3_result_value
-SPLite3_result_zeroblob
-SPLite3_create_collation
-SPLite3_create_collation_v2
-SPLite3_create_collation16
-SPLite3_collation_needed
-SPLite3_collation_needed16
-SPLite3_sleep
-SPLite3_temp_directory
-SPLite3_get_autocommit
-SPLite3_db_handle
-SPLite3_next_stmt
-SPLite3_commit_hook
-SPLite3_rollback_hook
-SPLite3_update_hook
-SPLite3_enable_shared_cache
-SPLite3_release_memory
-SPLite3_soft_heap_limit
-SPLite3_load_extension
-SPLite3_enable_load_extension
-SPLite3_auto_extension
-SPLite3_reset_auto_extension
-SPLite3_create_module
-SPLite3_create_module_v2
-SPLite3_declare_vtab
-SPLite3_overload_function
-SPLite3_blob_open
-SPLite3_blob_close
-SPLite3_blob_bytes
-SPLite3_blob_read
-SPLite3_blob_write
-SPLite3_vfs_find
-SPLite3_vfs_register
-SPLite3_vfs_unregister
-SPLite3_mutex_alloc
-SPLite3_mutex_free
-SPLite3_mutex_enter
-SPLite3_mutex_try
-SPLite3_mutex_leave
-SPLite3_db_mutex
-SPLite3_file_control
-SPLite3_test_control
-SPLite3_status
-SPLite3_db_status
-SPLite3_stmt_status
-SPLite3_backup_init
-SPLite3_backup_step
-SPLite3_backup_finish
-SPLite3_backup_remaining
-SPLite3_backup_pagecount
-SPLite3_strnicmp
-SPLite3_log
-SPLite3_wal_hook
-SPLite3_wal_autocheckpoint
-SPLite3_wal_checkpoint
-SPLite3_memory_alarm
-SPLite3_win32_mbcs_to_utf8
-SPLite3_expired
-SPLite3_aggregate_count
-SPLite3_transfer_bindings
-SPLite3_profile
-SPLite3_global_recover
-SPLite3_thread_cleanup
-sqlite3_extension_init