diff --git a/OsmAnd/.cproject b/OsmAnd/.cproject index d39c0c2ad8..8f6765b984 100644 --- a/OsmAnd/.cproject +++ b/OsmAnd/.cproject @@ -61,7 +61,7 @@ - + diff --git a/OsmAnd/jni/Android.mk b/OsmAnd/jni/Android.mk index 9bff14a26a..e8ce00c5d7 100755 --- a/OsmAnd/jni/Android.mk +++ b/OsmAnd/jni/Android.mk @@ -1,4 +1,4 @@ -OSMAND_MAKEFILES := $(all-subdir-makefiles) +OSMAND_MAKEFILES := ../Osmand-kernel/Android.mk # Protect from previous builds ifneq ($(TARGET_ARCH_ABI),armeabi-v7a) diff --git a/Osmand-kernel/.cproject b/Osmand-kernel/.cproject new file mode 100644 index 0000000000..8f6765b984 --- /dev/null +++ b/Osmand-kernel/.cproject @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Osmand-kernel/.project b/Osmand-kernel/.project new file mode 100644 index 0000000000..3370cd4380 --- /dev/null +++ b/Osmand-kernel/.project @@ -0,0 +1,13 @@ + + + Osmand-kernel + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + diff --git a/Osmand-kernel/Android.mk b/Osmand-kernel/Android.mk new file mode 100755 index 0000000000..8035975a1b --- /dev/null +++ b/Osmand-kernel/Android.mk @@ -0,0 +1,4 @@ +OSMAND_MAKEFILES := $(all-subdir-makefiles) +# By default, include makefiles only once +include $(OSMAND_MAKEFILES) + diff --git a/OsmAnd/jni/cpufeatures_proxy/Android.mk b/Osmand-kernel/cpufeatures_proxy/Android.mk similarity index 88% rename from OsmAnd/jni/cpufeatures_proxy/Android.mk rename to Osmand-kernel/cpufeatures_proxy/Android.mk index ecf9552b43..6c016c1cc7 100755 --- a/OsmAnd/jni/cpufeatures_proxy/Android.mk +++ b/Osmand-kernel/cpufeatures_proxy/Android.mk @@ -15,7 +15,7 @@ LOCAL_STATIC_LIBRARIES := cpufeatures include $(BUILD_SHARED_LIBRARY) else LOCAL_SRC_FILES := \ - ../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so + ../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so LOCAL_STATIC_LIBRARIES := cpufeatures include $(PREBUILT_SHARED_LIBRARY) endif diff --git a/OsmAnd/jni/cpufeatures_proxy/cpuCheck.cpp b/Osmand-kernel/cpufeatures_proxy/cpuCheck.cpp similarity index 100% rename from OsmAnd/jni/cpufeatures_proxy/cpuCheck.cpp rename to Osmand-kernel/cpufeatures_proxy/cpuCheck.cpp diff --git a/OsmAnd/jni/expat/Android.mk b/Osmand-kernel/expat/Android.mk similarity index 92% rename from OsmAnd/jni/expat/Android.mk rename to Osmand-kernel/expat/Android.mk index dfe6be4ea0..5ee5a86a86 100755 --- a/OsmAnd/jni/expat/Android.mk +++ b/Osmand-kernel/expat/Android.mk @@ -33,6 +33,6 @@ include $(BUILD_STATIC_LIBRARY) else LOCAL_SRC_FILES := \ - ../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a + ../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a include $(PREBUILT_STATIC_LIBRARY) endif diff --git a/OsmAnd/jni/expat/expat_library b/Osmand-kernel/expat/expat_library similarity index 100% rename from OsmAnd/jni/expat/expat_library rename to Osmand-kernel/expat/expat_library diff --git a/OsmAnd/jni/freetype/Android.mk b/Osmand-kernel/freetype/Android.mk similarity index 96% rename from OsmAnd/jni/freetype/Android.mk rename to Osmand-kernel/freetype/Android.mk index 10cd1b7432..8493fa6edc 100755 --- a/OsmAnd/jni/freetype/Android.mk +++ b/Osmand-kernel/freetype/Android.mk @@ -63,6 +63,6 @@ include $(BUILD_STATIC_LIBRARY) else LOCAL_SRC_FILES := \ - ../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a + ../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a include $(PREBUILT_STATIC_LIBRARY) -endif \ No newline at end of file +endif diff --git a/OsmAnd/jni/freetype/freetype_library b/Osmand-kernel/freetype/freetype_library similarity index 100% rename from OsmAnd/jni/freetype/freetype_library rename to Osmand-kernel/freetype/freetype_library diff --git a/OsmAnd/jni/gif/Android.mk b/Osmand-kernel/gif/Android.mk similarity index 90% rename from OsmAnd/jni/gif/Android.mk rename to Osmand-kernel/gif/Android.mk index d1d224dfd1..05327ff419 100755 --- a/OsmAnd/jni/gif/Android.mk +++ b/Osmand-kernel/gif/Android.mk @@ -30,6 +30,6 @@ include $(BUILD_STATIC_LIBRARY) else LOCAL_SRC_FILES := \ - ../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a + ../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a include $(PREBUILT_STATIC_LIBRARY) -endif \ No newline at end of file +endif diff --git a/OsmAnd/jni/gif/gif_library b/Osmand-kernel/gif/gif_library similarity index 100% rename from OsmAnd/jni/gif/gif_library rename to Osmand-kernel/gif/gif_library diff --git a/OsmAnd/jni-prebuilt/.gitignore b/Osmand-kernel/jni-prebuilt/.gitignore similarity index 100% rename from OsmAnd/jni-prebuilt/.gitignore rename to Osmand-kernel/jni-prebuilt/.gitignore diff --git a/OsmAnd/jni/jpeg/Android.mk b/Osmand-kernel/jpeg/Android.mk similarity index 97% rename from OsmAnd/jni/jpeg/Android.mk rename to Osmand-kernel/jpeg/Android.mk index 0ea59ca05b..11ddb18f9a 100755 --- a/OsmAnd/jni/jpeg/Android.mk +++ b/Osmand-kernel/jpeg/Android.mk @@ -86,6 +86,6 @@ include $(BUILD_STATIC_LIBRARY) else LOCAL_SRC_FILES := \ - ../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a + ../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a include $(PREBUILT_STATIC_LIBRARY) -endif \ No newline at end of file +endif diff --git a/OsmAnd/jni/jpeg/jpeg_library b/Osmand-kernel/jpeg/jpeg_library similarity index 100% rename from OsmAnd/jni/jpeg/jpeg_library rename to Osmand-kernel/jpeg/jpeg_library diff --git a/OsmAnd/jni/osmand/Android.mk b/Osmand-kernel/osmand/Android.mk similarity index 100% rename from OsmAnd/jni/osmand/Android.mk rename to Osmand-kernel/osmand/Android.mk diff --git a/OsmAnd/jni/osmand/binaryRead.cpp b/Osmand-kernel/osmand/binaryRead.cpp similarity index 100% rename from OsmAnd/jni/osmand/binaryRead.cpp rename to Osmand-kernel/osmand/binaryRead.cpp diff --git a/OsmAnd/jni/osmand/common.cpp b/Osmand-kernel/osmand/common.cpp similarity index 100% rename from OsmAnd/jni/osmand/common.cpp rename to Osmand-kernel/osmand/common.cpp diff --git a/OsmAnd/jni/osmand/common.h b/Osmand-kernel/osmand/common.h similarity index 100% rename from OsmAnd/jni/osmand/common.h rename to Osmand-kernel/osmand/common.h diff --git a/OsmAnd/jni/osmand/mapObjects.cpp b/Osmand-kernel/osmand/mapObjects.cpp similarity index 100% rename from OsmAnd/jni/osmand/mapObjects.cpp rename to Osmand-kernel/osmand/mapObjects.cpp diff --git a/OsmAnd/jni/osmand/mapObjects.h b/Osmand-kernel/osmand/mapObjects.h similarity index 100% rename from OsmAnd/jni/osmand/mapObjects.h rename to Osmand-kernel/osmand/mapObjects.h diff --git a/OsmAnd/jni/osmand/multipolygons.h b/Osmand-kernel/osmand/multipolygons.h similarity index 100% rename from OsmAnd/jni/osmand/multipolygons.h rename to Osmand-kernel/osmand/multipolygons.h diff --git a/OsmAnd/jni/osmand/proto/osmand_odb.pb.h b/Osmand-kernel/osmand/proto/osmand_odb.pb.h similarity index 100% rename from OsmAnd/jni/osmand/proto/osmand_odb.pb.h rename to Osmand-kernel/osmand/proto/osmand_odb.pb.h diff --git a/OsmAnd/jni/osmand/renderRules.cpp b/Osmand-kernel/osmand/renderRules.cpp similarity index 100% rename from OsmAnd/jni/osmand/renderRules.cpp rename to Osmand-kernel/osmand/renderRules.cpp diff --git a/OsmAnd/jni/osmand/renderRules.h b/Osmand-kernel/osmand/renderRules.h similarity index 100% rename from OsmAnd/jni/osmand/renderRules.h rename to Osmand-kernel/osmand/renderRules.h diff --git a/OsmAnd/jni/osmand/rendering.cpp b/Osmand-kernel/osmand/rendering.cpp similarity index 100% rename from OsmAnd/jni/osmand/rendering.cpp rename to Osmand-kernel/osmand/rendering.cpp diff --git a/OsmAnd/jni/osmand/textdraw.cpp b/Osmand-kernel/osmand/textdraw.cpp similarity index 100% rename from OsmAnd/jni/osmand/textdraw.cpp rename to Osmand-kernel/osmand/textdraw.cpp diff --git a/OsmAnd/jni/osmand/utf8.cpp b/Osmand-kernel/osmand/utf8.cpp similarity index 100% rename from OsmAnd/jni/osmand/utf8.cpp rename to Osmand-kernel/osmand/utf8.cpp diff --git a/OsmAnd/jni/png/Android.mk b/Osmand-kernel/png/Android.mk similarity index 96% rename from OsmAnd/jni/png/Android.mk rename to Osmand-kernel/png/Android.mk index bfbd30057b..69156321cb 100755 --- a/OsmAnd/jni/png/Android.mk +++ b/Osmand-kernel/png/Android.mk @@ -63,6 +63,6 @@ include $(BUILD_STATIC_LIBRARY) else LOCAL_SRC_FILES := \ - ../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a + ../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a include $(PREBUILT_STATIC_LIBRARY) -endif \ No newline at end of file +endif diff --git a/OsmAnd/jni/png/png_library b/Osmand-kernel/png/png_library similarity index 100% rename from OsmAnd/jni/png/png_library rename to Osmand-kernel/png/png_library diff --git a/OsmAnd/jni/protobuf/Android.mk b/Osmand-kernel/protobuf/Android.mk similarity index 95% rename from OsmAnd/jni/protobuf/Android.mk rename to Osmand-kernel/protobuf/Android.mk index c18c97cc80..d2c7f1d7c0 100644 --- a/OsmAnd/jni/protobuf/Android.mk +++ b/Osmand-kernel/protobuf/Android.mk @@ -40,6 +40,6 @@ include $(BUILD_STATIC_LIBRARY) else LOCAL_SRC_FILES := \ - ../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a + ../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a include $(PREBUILT_STATIC_LIBRARY) -endif \ No newline at end of file +endif diff --git a/OsmAnd/jni/protobuf/config.h b/Osmand-kernel/protobuf/config.h similarity index 100% rename from OsmAnd/jni/protobuf/config.h rename to Osmand-kernel/protobuf/config.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/descriptor.cc b/Osmand-kernel/protobuf/google/protobuf/descriptor.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/descriptor.cc rename to Osmand-kernel/protobuf/google/protobuf/descriptor.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/descriptor.h b/Osmand-kernel/protobuf/google/protobuf/descriptor.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/descriptor.h rename to Osmand-kernel/protobuf/google/protobuf/descriptor.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/descriptor.pb.cc b/Osmand-kernel/protobuf/google/protobuf/descriptor.pb.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/descriptor.pb.cc rename to Osmand-kernel/protobuf/google/protobuf/descriptor.pb.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/descriptor.pb.h b/Osmand-kernel/protobuf/google/protobuf/descriptor.pb.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/descriptor.pb.h rename to Osmand-kernel/protobuf/google/protobuf/descriptor.pb.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/descriptor.proto b/Osmand-kernel/protobuf/google/protobuf/descriptor.proto similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/descriptor.proto rename to Osmand-kernel/protobuf/google/protobuf/descriptor.proto diff --git a/OsmAnd/jni/protobuf/google/protobuf/descriptor_database.cc b/Osmand-kernel/protobuf/google/protobuf/descriptor_database.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/descriptor_database.cc rename to Osmand-kernel/protobuf/google/protobuf/descriptor_database.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/descriptor_database.h b/Osmand-kernel/protobuf/google/protobuf/descriptor_database.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/descriptor_database.h rename to Osmand-kernel/protobuf/google/protobuf/descriptor_database.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/descriptor_database_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/descriptor_database_unittest.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/descriptor_database_unittest.cc rename to Osmand-kernel/protobuf/google/protobuf/descriptor_database_unittest.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/descriptor_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/descriptor_unittest.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/descriptor_unittest.cc rename to Osmand-kernel/protobuf/google/protobuf/descriptor_unittest.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/dynamic_message.cc b/Osmand-kernel/protobuf/google/protobuf/dynamic_message.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/dynamic_message.cc rename to Osmand-kernel/protobuf/google/protobuf/dynamic_message.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/dynamic_message.h b/Osmand-kernel/protobuf/google/protobuf/dynamic_message.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/dynamic_message.h rename to Osmand-kernel/protobuf/google/protobuf/dynamic_message.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/dynamic_message_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/dynamic_message_unittest.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/dynamic_message_unittest.cc rename to Osmand-kernel/protobuf/google/protobuf/dynamic_message_unittest.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/extension_set.cc b/Osmand-kernel/protobuf/google/protobuf/extension_set.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/extension_set.cc rename to Osmand-kernel/protobuf/google/protobuf/extension_set.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/extension_set.h b/Osmand-kernel/protobuf/google/protobuf/extension_set.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/extension_set.h rename to Osmand-kernel/protobuf/google/protobuf/extension_set.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/extension_set_heavy.cc b/Osmand-kernel/protobuf/google/protobuf/extension_set_heavy.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/extension_set_heavy.cc rename to Osmand-kernel/protobuf/google/protobuf/extension_set_heavy.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/extension_set_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/extension_set_unittest.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/extension_set_unittest.cc rename to Osmand-kernel/protobuf/google/protobuf/extension_set_unittest.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/generated_message_reflection.cc b/Osmand-kernel/protobuf/google/protobuf/generated_message_reflection.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/generated_message_reflection.cc rename to Osmand-kernel/protobuf/google/protobuf/generated_message_reflection.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/generated_message_reflection.h b/Osmand-kernel/protobuf/google/protobuf/generated_message_reflection.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/generated_message_reflection.h rename to Osmand-kernel/protobuf/google/protobuf/generated_message_reflection.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/generated_message_reflection_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/generated_message_reflection_unittest.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/generated_message_reflection_unittest.cc rename to Osmand-kernel/protobuf/google/protobuf/generated_message_reflection_unittest.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/generated_message_util.cc b/Osmand-kernel/protobuf/google/protobuf/generated_message_util.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/generated_message_util.cc rename to Osmand-kernel/protobuf/google/protobuf/generated_message_util.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/generated_message_util.h b/Osmand-kernel/protobuf/google/protobuf/generated_message_util.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/generated_message_util.h rename to Osmand-kernel/protobuf/google/protobuf/generated_message_util.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/coded_stream.cc b/Osmand-kernel/protobuf/google/protobuf/io/coded_stream.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/coded_stream.cc rename to Osmand-kernel/protobuf/google/protobuf/io/coded_stream.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/coded_stream.h b/Osmand-kernel/protobuf/google/protobuf/io/coded_stream.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/coded_stream.h rename to Osmand-kernel/protobuf/google/protobuf/io/coded_stream.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/coded_stream_inl.h b/Osmand-kernel/protobuf/google/protobuf/io/coded_stream_inl.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/coded_stream_inl.h rename to Osmand-kernel/protobuf/google/protobuf/io/coded_stream_inl.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/coded_stream_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/io/coded_stream_unittest.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/coded_stream_unittest.cc rename to Osmand-kernel/protobuf/google/protobuf/io/coded_stream_unittest.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/gzip_stream.cc b/Osmand-kernel/protobuf/google/protobuf/io/gzip_stream.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/gzip_stream.cc rename to Osmand-kernel/protobuf/google/protobuf/io/gzip_stream.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/gzip_stream.h b/Osmand-kernel/protobuf/google/protobuf/io/gzip_stream.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/gzip_stream.h rename to Osmand-kernel/protobuf/google/protobuf/io/gzip_stream.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/gzip_stream_unittest.sh b/Osmand-kernel/protobuf/google/protobuf/io/gzip_stream_unittest.sh similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/gzip_stream_unittest.sh rename to Osmand-kernel/protobuf/google/protobuf/io/gzip_stream_unittest.sh diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/package_info.h b/Osmand-kernel/protobuf/google/protobuf/io/package_info.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/package_info.h rename to Osmand-kernel/protobuf/google/protobuf/io/package_info.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/printer.cc b/Osmand-kernel/protobuf/google/protobuf/io/printer.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/printer.cc rename to Osmand-kernel/protobuf/google/protobuf/io/printer.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/printer.h b/Osmand-kernel/protobuf/google/protobuf/io/printer.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/printer.h rename to Osmand-kernel/protobuf/google/protobuf/io/printer.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/printer_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/io/printer_unittest.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/printer_unittest.cc rename to Osmand-kernel/protobuf/google/protobuf/io/printer_unittest.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/tokenizer.cc b/Osmand-kernel/protobuf/google/protobuf/io/tokenizer.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/tokenizer.cc rename to Osmand-kernel/protobuf/google/protobuf/io/tokenizer.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/tokenizer.h b/Osmand-kernel/protobuf/google/protobuf/io/tokenizer.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/tokenizer.h rename to Osmand-kernel/protobuf/google/protobuf/io/tokenizer.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/tokenizer_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/io/tokenizer_unittest.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/tokenizer_unittest.cc rename to Osmand-kernel/protobuf/google/protobuf/io/tokenizer_unittest.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream.cc b/Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream.cc rename to Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream.h b/Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream.h rename to Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream_impl.cc b/Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream_impl.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream_impl.cc rename to Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream_impl.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream_impl.h b/Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream_impl.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream_impl.h rename to Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream_impl.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc b/Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc rename to Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.h b/Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.h rename to Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream_unittest.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream_unittest.cc rename to Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream_unittest.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/lite_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/lite_unittest.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/lite_unittest.cc rename to Osmand-kernel/protobuf/google/protobuf/lite_unittest.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/message.cc b/Osmand-kernel/protobuf/google/protobuf/message.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/message.cc rename to Osmand-kernel/protobuf/google/protobuf/message.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/message.h b/Osmand-kernel/protobuf/google/protobuf/message.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/message.h rename to Osmand-kernel/protobuf/google/protobuf/message.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/message_lite.cc b/Osmand-kernel/protobuf/google/protobuf/message_lite.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/message_lite.cc rename to Osmand-kernel/protobuf/google/protobuf/message_lite.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/message_lite.h b/Osmand-kernel/protobuf/google/protobuf/message_lite.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/message_lite.h rename to Osmand-kernel/protobuf/google/protobuf/message_lite.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/message_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/message_unittest.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/message_unittest.cc rename to Osmand-kernel/protobuf/google/protobuf/message_unittest.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/package_info.h b/Osmand-kernel/protobuf/google/protobuf/package_info.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/package_info.h rename to Osmand-kernel/protobuf/google/protobuf/package_info.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/reflection_ops.cc b/Osmand-kernel/protobuf/google/protobuf/reflection_ops.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/reflection_ops.cc rename to Osmand-kernel/protobuf/google/protobuf/reflection_ops.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/reflection_ops.h b/Osmand-kernel/protobuf/google/protobuf/reflection_ops.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/reflection_ops.h rename to Osmand-kernel/protobuf/google/protobuf/reflection_ops.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/reflection_ops_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/reflection_ops_unittest.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/reflection_ops_unittest.cc rename to Osmand-kernel/protobuf/google/protobuf/reflection_ops_unittest.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/repeated_field.cc b/Osmand-kernel/protobuf/google/protobuf/repeated_field.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/repeated_field.cc rename to Osmand-kernel/protobuf/google/protobuf/repeated_field.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/repeated_field.h b/Osmand-kernel/protobuf/google/protobuf/repeated_field.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/repeated_field.h rename to Osmand-kernel/protobuf/google/protobuf/repeated_field.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/repeated_field_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/repeated_field_unittest.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/repeated_field_unittest.cc rename to Osmand-kernel/protobuf/google/protobuf/repeated_field_unittest.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/service.cc b/Osmand-kernel/protobuf/google/protobuf/service.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/service.cc rename to Osmand-kernel/protobuf/google/protobuf/service.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/service.h b/Osmand-kernel/protobuf/google/protobuf/service.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/service.h rename to Osmand-kernel/protobuf/google/protobuf/service.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/common.cc b/Osmand-kernel/protobuf/google/protobuf/stubs/common.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/stubs/common.cc rename to Osmand-kernel/protobuf/google/protobuf/stubs/common.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/common.h b/Osmand-kernel/protobuf/google/protobuf/stubs/common.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/stubs/common.h rename to Osmand-kernel/protobuf/google/protobuf/stubs/common.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/common_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/stubs/common_unittest.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/stubs/common_unittest.cc rename to Osmand-kernel/protobuf/google/protobuf/stubs/common_unittest.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/hash.cc b/Osmand-kernel/protobuf/google/protobuf/stubs/hash.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/stubs/hash.cc rename to Osmand-kernel/protobuf/google/protobuf/stubs/hash.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/hash.h b/Osmand-kernel/protobuf/google/protobuf/stubs/hash.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/stubs/hash.h rename to Osmand-kernel/protobuf/google/protobuf/stubs/hash.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/map-util.h b/Osmand-kernel/protobuf/google/protobuf/stubs/map-util.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/stubs/map-util.h rename to Osmand-kernel/protobuf/google/protobuf/stubs/map-util.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/once.cc b/Osmand-kernel/protobuf/google/protobuf/stubs/once.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/stubs/once.cc rename to Osmand-kernel/protobuf/google/protobuf/stubs/once.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/once.h b/Osmand-kernel/protobuf/google/protobuf/stubs/once.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/stubs/once.h rename to Osmand-kernel/protobuf/google/protobuf/stubs/once.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/once_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/stubs/once_unittest.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/stubs/once_unittest.cc rename to Osmand-kernel/protobuf/google/protobuf/stubs/once_unittest.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/stl_util-inl.h b/Osmand-kernel/protobuf/google/protobuf/stubs/stl_util-inl.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/stubs/stl_util-inl.h rename to Osmand-kernel/protobuf/google/protobuf/stubs/stl_util-inl.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/structurally_valid.cc b/Osmand-kernel/protobuf/google/protobuf/stubs/structurally_valid.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/stubs/structurally_valid.cc rename to Osmand-kernel/protobuf/google/protobuf/stubs/structurally_valid.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/structurally_valid_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/stubs/structurally_valid_unittest.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/stubs/structurally_valid_unittest.cc rename to Osmand-kernel/protobuf/google/protobuf/stubs/structurally_valid_unittest.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/strutil.cc b/Osmand-kernel/protobuf/google/protobuf/stubs/strutil.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/stubs/strutil.cc rename to Osmand-kernel/protobuf/google/protobuf/stubs/strutil.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/strutil.h b/Osmand-kernel/protobuf/google/protobuf/stubs/strutil.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/stubs/strutil.h rename to Osmand-kernel/protobuf/google/protobuf/stubs/strutil.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/strutil_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/stubs/strutil_unittest.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/stubs/strutil_unittest.cc rename to Osmand-kernel/protobuf/google/protobuf/stubs/strutil_unittest.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/substitute.cc b/Osmand-kernel/protobuf/google/protobuf/stubs/substitute.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/stubs/substitute.cc rename to Osmand-kernel/protobuf/google/protobuf/stubs/substitute.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/substitute.h b/Osmand-kernel/protobuf/google/protobuf/stubs/substitute.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/stubs/substitute.h rename to Osmand-kernel/protobuf/google/protobuf/stubs/substitute.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/test_util.cc b/Osmand-kernel/protobuf/google/protobuf/test_util.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/test_util.cc rename to Osmand-kernel/protobuf/google/protobuf/test_util.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/test_util.h b/Osmand-kernel/protobuf/google/protobuf/test_util.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/test_util.h rename to Osmand-kernel/protobuf/google/protobuf/test_util.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/test_util_lite.cc b/Osmand-kernel/protobuf/google/protobuf/test_util_lite.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/test_util_lite.cc rename to Osmand-kernel/protobuf/google/protobuf/test_util_lite.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/test_util_lite.h b/Osmand-kernel/protobuf/google/protobuf/test_util_lite.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/test_util_lite.h rename to Osmand-kernel/protobuf/google/protobuf/test_util_lite.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/text_format.cc b/Osmand-kernel/protobuf/google/protobuf/text_format.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/text_format.cc rename to Osmand-kernel/protobuf/google/protobuf/text_format.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/text_format.h b/Osmand-kernel/protobuf/google/protobuf/text_format.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/text_format.h rename to Osmand-kernel/protobuf/google/protobuf/text_format.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/text_format_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/text_format_unittest.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/text_format_unittest.cc rename to Osmand-kernel/protobuf/google/protobuf/text_format_unittest.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/unknown_field_set.cc b/Osmand-kernel/protobuf/google/protobuf/unknown_field_set.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/unknown_field_set.cc rename to Osmand-kernel/protobuf/google/protobuf/unknown_field_set.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/unknown_field_set.h b/Osmand-kernel/protobuf/google/protobuf/unknown_field_set.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/unknown_field_set.h rename to Osmand-kernel/protobuf/google/protobuf/unknown_field_set.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/unknown_field_set_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/unknown_field_set_unittest.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/unknown_field_set_unittest.cc rename to Osmand-kernel/protobuf/google/protobuf/unknown_field_set_unittest.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/wire_format.cc b/Osmand-kernel/protobuf/google/protobuf/wire_format.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/wire_format.cc rename to Osmand-kernel/protobuf/google/protobuf/wire_format.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/wire_format.h b/Osmand-kernel/protobuf/google/protobuf/wire_format.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/wire_format.h rename to Osmand-kernel/protobuf/google/protobuf/wire_format.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/wire_format_lite.cc b/Osmand-kernel/protobuf/google/protobuf/wire_format_lite.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/wire_format_lite.cc rename to Osmand-kernel/protobuf/google/protobuf/wire_format_lite.cc diff --git a/OsmAnd/jni/protobuf/google/protobuf/wire_format_lite.h b/Osmand-kernel/protobuf/google/protobuf/wire_format_lite.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/wire_format_lite.h rename to Osmand-kernel/protobuf/google/protobuf/wire_format_lite.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/wire_format_lite_inl.h b/Osmand-kernel/protobuf/google/protobuf/wire_format_lite_inl.h similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/wire_format_lite_inl.h rename to Osmand-kernel/protobuf/google/protobuf/wire_format_lite_inl.h diff --git a/OsmAnd/jni/protobuf/google/protobuf/wire_format_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/wire_format_unittest.cc similarity index 100% rename from OsmAnd/jni/protobuf/google/protobuf/wire_format_unittest.cc rename to Osmand-kernel/protobuf/google/protobuf/wire_format_unittest.cc diff --git a/OsmAnd/jni/skia/Android.mk b/Osmand-kernel/skia/Android.mk similarity index 99% rename from OsmAnd/jni/skia/Android.mk rename to Osmand-kernel/skia/Android.mk index e1480c621d..aaaf839a2a 100755 --- a/OsmAnd/jni/skia/Android.mk +++ b/Osmand-kernel/skia/Android.mk @@ -330,10 +330,10 @@ include $(BUILD_STATIC_LIBRARY) else LOCAL_SRC_FILES := \ - ../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a + ../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a include $(PREBUILT_STATIC_LIBRARY) endif # Fix some errors BUILD_HOST_EXECUTABLE := $(LOCAL_PATH)/FakeHost.mk -BUILD_HOST_STATIC_LIBRARY := $(LOCAL_PATH)/FakeHost.mk \ No newline at end of file +BUILD_HOST_STATIC_LIBRARY := $(LOCAL_PATH)/FakeHost.mk diff --git a/OsmAnd/jni/skia/FakeHost.mk b/Osmand-kernel/skia/FakeHost.mk similarity index 100% rename from OsmAnd/jni/skia/FakeHost.mk rename to Osmand-kernel/skia/FakeHost.mk diff --git a/OsmAnd/jni/skia/FontHostConfiguration_android.cpp b/Osmand-kernel/skia/FontHostConfiguration_android.cpp similarity index 100% rename from OsmAnd/jni/skia/FontHostConfiguration_android.cpp rename to Osmand-kernel/skia/FontHostConfiguration_android.cpp diff --git a/OsmAnd/jni/skia/cutils/properties.h b/Osmand-kernel/skia/cutils/properties.h similarity index 100% rename from OsmAnd/jni/skia/cutils/properties.h rename to Osmand-kernel/skia/cutils/properties.h diff --git a/OsmAnd/jni/skia/skia_library b/Osmand-kernel/skia/skia_library similarity index 100% rename from OsmAnd/jni/skia/skia_library rename to Osmand-kernel/skia/skia_library diff --git a/OsmAnd/jni/skia/utils/misc.h b/Osmand-kernel/skia/utils/misc.h similarity index 100% rename from OsmAnd/jni/skia/utils/misc.h rename to Osmand-kernel/skia/utils/misc.h