| @@ -77,7 +77,6 @@ public: | |||||
| createBaseExporterProperties (props); | createBaseExporterProperties (props); | ||||
| createToolchainExporterProperties (props); | createToolchainExporterProperties (props); | ||||
| createManifestExporterProperties (props); | createManifestExporterProperties (props); | ||||
| createLibraryModuleExporterProperties (props); | |||||
| createCodeSigningExporterProperties (props); | createCodeSigningExporterProperties (props); | ||||
| createOtherExporterProperties (props); | createOtherExporterProperties (props); | ||||
| } | } | ||||
| @@ -98,11 +97,10 @@ public: | |||||
| //============================================================================== | //============================================================================== | ||||
| ValueWithDefault androidJavaLibs, androidAdditionalJavaFolders, androidAdditionalResourceFolders, androidRepositories, androidDependencies, androidCustomAppBuildGradleContent, | ValueWithDefault androidJavaLibs, androidAdditionalJavaFolders, androidAdditionalResourceFolders, androidRepositories, androidDependencies, androidCustomAppBuildGradleContent, | ||||
| androidScreenOrientation, androidCustomActivityClass, androidCustomApplicationClass, androidManifestCustomXmlElements, androidGradleSettingsContent, androidVersionCode, | androidScreenOrientation, androidCustomActivityClass, androidCustomApplicationClass, androidManifestCustomXmlElements, androidGradleSettingsContent, androidVersionCode, | ||||
| androidMinimumSDK, androidTargetSDK, androidTheme, androidSharedLibraries, androidStaticLibraries, androidExtraAssetsFolder, | |||||
| androidOboeRepositoryPath, androidInternetNeeded, androidMicNeeded, androidCameraNeeded, androidBluetoothNeeded, androidExternalReadPermission, | |||||
| androidExternalWritePermission, androidInAppBillingPermission, androidVibratePermission, androidOtherPermissions, | |||||
| androidEnableRemoteNotifications, androidRemoteNotificationsConfigFile, androidEnableContentSharing, androidKeyStore, | |||||
| androidKeyStorePass, androidKeyAlias, androidKeyAliasPass, gradleVersion, gradleToolchain, androidPluginVersion; | |||||
| androidMinimumSDK, androidTargetSDK, androidTheme, androidExtraAssetsFolder, androidOboeRepositoryPath, androidInternetNeeded, androidMicNeeded, androidCameraNeeded, | |||||
| androidBluetoothNeeded, androidExternalReadPermission, androidExternalWritePermission, androidInAppBillingPermission, androidVibratePermission, androidOtherPermissions, | |||||
| androidEnableRemoteNotifications, androidRemoteNotificationsConfigFile, androidEnableContentSharing, androidKeyStore, androidKeyStorePass, androidKeyAlias, androidKeyAliasPass, | |||||
| gradleVersion, gradleToolchain, androidPluginVersion; | |||||
| //============================================================================== | //============================================================================== | ||||
| AndroidProjectExporter (Project& p, const ValueTree& t) | AndroidProjectExporter (Project& p, const ValueTree& t) | ||||
| @@ -122,8 +120,6 @@ public: | |||||
| androidMinimumSDK (settings, Ids::androidMinimumSDK, getUndoManager(), "16"), | androidMinimumSDK (settings, Ids::androidMinimumSDK, getUndoManager(), "16"), | ||||
| androidTargetSDK (settings, Ids::androidTargetSDK, getUndoManager(), "28"), | androidTargetSDK (settings, Ids::androidTargetSDK, getUndoManager(), "28"), | ||||
| androidTheme (settings, Ids::androidTheme, getUndoManager()), | androidTheme (settings, Ids::androidTheme, getUndoManager()), | ||||
| androidSharedLibraries (settings, Ids::androidSharedLibraries, getUndoManager()), | |||||
| androidStaticLibraries (settings, Ids::androidStaticLibraries, getUndoManager()), | |||||
| androidExtraAssetsFolder (settings, Ids::androidExtraAssetsFolder, getUndoManager()), | androidExtraAssetsFolder (settings, Ids::androidExtraAssetsFolder, getUndoManager()), | ||||
| androidOboeRepositoryPath (settings, Ids::androidOboeRepositoryPath, getUndoManager()), | androidOboeRepositoryPath (settings, Ids::androidOboeRepositoryPath, getUndoManager()), | ||||
| androidInternetNeeded (settings, Ids::androidInternetNeeded, getUndoManager(), true), | androidInternetNeeded (settings, Ids::androidInternetNeeded, getUndoManager(), true), | ||||
| @@ -167,15 +163,6 @@ public: | |||||
| "The toolchain that gradle should invoke for NDK compilation (variable model.android.ndk.tooclhain in app/build.gradle)"); | "The toolchain that gradle should invoke for NDK compilation (variable model.android.ndk.tooclhain in app/build.gradle)"); | ||||
| } | } | ||||
| void createLibraryModuleExporterProperties (PropertyListBuilder& props) | |||||
| { | |||||
| props.add (new TextPropertyComponent (androidStaticLibraries, "Import Static Library Modules", 8192, true), | |||||
| "Comma or whitespace delimited list of static libraries (.a) defined in NDK_MODULE_PATH."); | |||||
| props.add (new TextPropertyComponent (androidSharedLibraries, "Import Shared Library Modules", 8192, true), | |||||
| "Comma or whitespace delimited list of shared libraries (.so) defined in NDK_MODULE_PATH."); | |||||
| } | |||||
| //============================================================================== | //============================================================================== | ||||
| bool canLaunchProject() override | bool canLaunchProject() override | ||||
| { | { | ||||