Fix android target name

armory3d · Sep 8, 2019 · 01920b9 · 01920b9
1 parent 410230b
commit 01920b9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/blender/arm/make.py b/blender/arm/make.py
@@ -572,7 +572,7 @@ def build_success():
             print('Exported XCode project to ' + files_path + '-build')
         elif target_name.startswith('windows'):
             print('Exported Visual Studio 2017 project to ' + files_path + '-build')
-        elif target_name.startswith('android-native'):
+        elif target_name.startswith('android'):
             print('Exported Android Studio project to ' + files_path + '-build/' + arm.utils.safestr(wrd.arm_project_name))
         elif target_name.startswith('krom'):
             print('Exported Krom package to ' + files_path)

diff --git a/blender/arm/props_exporter.py b/blender/arm/props_exporter.py
@@ -76,7 +76,7 @@ class ArmExporterListItem(bpy.types.PropertyGroup):
                  ('linux-hl', 'Linux (C)', 'linux-hl'),
                  ('krom-linux', 'Linux (Krom)', 'krom-linux'),
                  ('ios-hl', 'iOS (C)', 'ios-hl'),
-                 ('android-native-hl', 'Android (C)', 'android-native-hl'),
+                 ('android-hl', 'Android (C)', 'android-hl'),
                  ('node', 'Node (JS)', 'node'),
                  ('custom', 'Custom', 'custom'),],
         name="Target", default='html5', description='Build platform')

diff --git a/blender/arm/utils.py b/blender/arm/utils.py
@@ -645,7 +645,7 @@ def target_to_gapi(arm_project_target):
         return 'arm_gapi_mac'
     elif arm_project_target == 'macos-hl':
         return 'arm_gapi_mac'
-    elif arm_project_target == 'android-native-hl':
+    elif arm_project_target == 'android-hl':
         return 'arm_gapi_android'
     elif arm_project_target == 'ios-hl':
         return 'arm_gapi_ios'

diff --git a/blender/arm/write_data.py b/blender/arm/write_data.py
@@ -275,11 +275,11 @@ def write_khafilejs(is_play, export_physics, export_navigation, export_ui, is_pu
         if wrd.arm_khafile != None:
             f.write(wrd.arm_khafile.as_string())
 
-        if state.target.startswith('android-native'):
+        if state.target.startswith('android'):
             bundle = 'org.armory3d.' + wrd.arm_project_package if wrd.arm_project_bundle == '' else wrd.arm_project_bundle
-            f.write("project.targetOptions.android_native.package = '{0}';\n".format(arm.utils.safestr(bundle)))
+            f.write("project.targetOptions.android.package = '{0}';\n".format(arm.utils.safestr(bundle)))
             if wrd.arm_winorient != 'Multi':
-                f.write("project.targetOptions.android_native.screenOrientation = '{0}';\n".format(wrd.arm_winorient.lower()))
+                f.write("project.targetOptions.android.screenOrientation = '{0}';\n".format(wrd.arm_winorient.lower()))
         elif state.target.startswith('ios'):
             bundle = 'org.armory3d.' + wrd.arm_project_package if wrd.arm_project_bundle == '' else wrd.arm_project_bundle
             f.write("project.targetOptions.ios.bundle = '{0}';\n".format(arm.utils.safestr(bundle)))