renamed library to service_library

Author: zworkb

pythonforandroid/bootstraps/common/build/build.py

@@ -274,7 +274,7 @@ def compile_dir(dfn, optimize_python=True):
 def make_package(args):
     # If no launcher is specified, require a main.py/main.pyo:
     if (get_bootstrap_name() != "sdl" or args.launcher is None) and \
-            get_bootstrap_name() not in ["webview", "library"]:
+            get_bootstrap_name() not in ["webview", "service_library"]:
         # (webview doesn't need an entrypoint, apparently)
         if args.private is None or (
                 not exists(join(realpath(args.private), 'main.py')) and
@@ -530,7 +530,7 @@ def make_package(args):
         jars=jars,
         android_api=android_api,
         build_tools_version=build_tools_version,
-        is_library=get_bootstrap_name() == 'library',
+        is_library=get_bootstrap_name() == 'service_library',
     )
 
     # ant build templates

pythonforandroid/bootstraps/library/__init__.py

@@ -0,0 +1,9 @@
+from pythonforandroid.bootstraps.service_only import ServiceOnlyBootstrap
+
+
+class ServiceLibraryBootstrap(ServiceOnlyBootstrap):
+
+    name = 'service_library'
+
+
+bootstrap = ServiceLibraryBootstrap()

pythonforandroid/bootstraps/service_library/__init__.py

@@ -2,5 +2,5 @@
 #define BOOTSTRAP_NAME_LIBRARY
 #define BOOTSTRAP_USES_NO_SDL_HEADERS
 
-const char bootstrap_name[] = "library";
+const char bootstrap_name[] = "service_library";
 

pythonforandroid/bootstraps/library/build/jni/application/src/bootstrap_name.h renamed to pythonforandroid/bootstraps/service_library/build/jni/application/src/bootstrap_name.h

@@ -41,7 +41,7 @@ def prebuild_arch(self, arch):
         is_webview = bootstrap_name == 'webview'
         is_service_only = bootstrap_name == 'service_only'
 
-        if is_sdl2 or is_webview or is_service_only or bootstrap_name == 'library':
+        if is_sdl2 or is_webview or is_service_only or bootstrap_name == 'service_library':
             if is_sdl2:
                 bootstrap = 'sdl2'
             java_ns = u'org.kivy.android'

pythonforandroid/bootstraps/library/build/src/main/java/org/kivy/android/PythonActivity.java renamed to pythonforandroid/bootstraps/service_library/build/src/main/java/org/kivy/android/PythonActivity.java

@@ -150,7 +150,7 @@ def test_all_bootstraps(self):
         expected_bootstraps = {
             "empty",
             "service_only",
-            "library",
+            "service_library",
             "webview",
             "sdl2",
         }