service: use --private dir prior do --dir if exists.

tito · tito · commit 0c4c2a3bbacf · 2013-05-10T11:04:39.000+02:00
diff --git a/src/build.py b/src/build.py
@@ -232,8 +232,9 @@ def make_package(args):
 
     # Figure out if application has service part
     service = False
-    if args.dir:
-        service_main = join(realpath(args.dir), 'service', 'main.py')
+    directory = args.private or args.dir
+    if directory:
+        service_main = join(realpath(directory), 'service', 'main.py')
         if os.path.exists(service_main):
             service = True
 
diff --git a/src/templates/AndroidManifest.tmpl.xml b/src/templates/AndroidManifest.tmpl.xml
@@ -42,8 +42,7 @@
 
     {% if args.launcher %}
     <activity android:name="org.renpy.android.ProjectChooser"
-              android:label="@string/iconName"
-              >
+              android:label="@string/iconName">
 
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
@@ -55,9 +54,7 @@
 
     {% if service %}
     <service android:name="org.renpy.android.PythonService"
-             android:process=":PythonService"
-              >
-    </service>
+             android:process=":PythonService"/>
     {% endif %}
 
   </application>
