compiler-options

Author: zworkb

pythonforandroid/bootstraps/common/build/build.py

@@ -670,14 +670,9 @@ def parse_args(args=None):
     ap.add_argument('--android-apptheme', dest='android_apptheme',
                     default='@android:style/Theme.NoTitleBar',
                     help='defines which app theme should be selected for the main activity')
-    ap.add_argument('--add-java-source-compat', dest='java_source_compat',
-                    default=[],
-                    action='append',
-                    help='add java source compatibility to gradle.build')
-    ap.add_argument('--add-java-target-compat', dest='java_target_compat',
-                    default=[],
-                    action='append',
-                    help='add java target compatibility to gradle.build')
+
+    ap.add_argument('--add-compile-option', dest='compile_options', default=[],
+                    action='append', help='add compile options to gradle.build')
     ap.add_argument('--add-gradle-repository', dest='gradle_repositories',
                     default=[],
                     action='append',

pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle

@@ -66,11 +66,8 @@ android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
-        {%- for compat in args.java_source_compat %}
-        sourceCompatibility {{compat}}
-        {%- endfor %}
-        {%- for compat in args.java_target_compat %}
-        targetCompatibility {{compat}}
+        {%- for option in args.compile_options %}
+        {{option}}
         {%- endfor %}
     }