Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade Android build to Gradle build system
The old Ant build system has been deprecated for a while and new development is focused on Gradle. I also removed a hardcoded string that lint caught and moved the patch files to a subdirectory. I left the JNI files in the root directory.
- Loading branch information
1 parent
7baddd1
commit e416738
Showing
29 changed files
with
291 additions
and
287 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| buildscript { | ||
| repositories { | ||
| mavenCentral() | ||
| } | ||
| dependencies { | ||
| classpath "com.android.tools.build:gradle:1.5.0" | ||
| } | ||
| } | ||
|
|
||
| apply plugin: "com.android.application" | ||
|
|
||
| android { | ||
| compileSdkVersion 23 | ||
| buildToolsVersion "23.0.3" | ||
|
|
||
| defaultConfig { | ||
| versionCode 13 | ||
| versionName "${System.env.VERSION_STR}.${versionCode}" | ||
| minSdkVersion 9 | ||
| targetSdkVersion 9 | ||
| applicationId "net.minetest.minetest" | ||
| manifestPlaceholders = [ package: "net.minetest.minetest", project: project.name ] | ||
| } | ||
|
|
||
| lintOptions { | ||
| disable "OldTargetApi", "GoogleAppIndexingWarning" | ||
| } | ||
|
|
||
| Properties props = new Properties() | ||
| props.load(new FileInputStream(file("local.properties"))) | ||
|
|
||
| if (props.getProperty("keystore") != null) { | ||
| signingConfigs { | ||
| release { | ||
| storeFile file(props["keystore"]) | ||
| storePassword props["keystore.password"] | ||
| keyAlias props["key"] | ||
| keyPassword props["key.password"] | ||
| } | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| signingConfig signingConfigs.release | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,9 @@ | ||
| # NDK_TOOLCHAIN_VERSION := clang3.3 | ||
| # NDK_TOOLCHAIN_VERSION := clang3.8 | ||
|
|
||
| APP_PLATFORM := android-9 | ||
| APP_MODULES := minetest | ||
| APP_STL := gnustl_static | ||
|
|
||
| APP_CPPFLAGS += -fexceptions | ||
| APP_GNUSTL_FORCE_CPP_FEATURES := rtti | ||
|
|
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| rootProject.name = "Minetest" | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <uses-permission android:name="android.permission.SET_DEBUG_APP" /> | ||
| </manifest> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| package="net.minetest.minetest" | ||
| android:installLocation="auto"> | ||
| <uses-feature android:glEsVersion="0x00010000" android:required="true"/> | ||
| <uses-permission android:name="android.permission.INTERNET" /> | ||
| <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> | ||
| <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> | ||
| <application android:icon="@drawable/irr_icon" | ||
| android:label="${project}" | ||
| android:theme="@android:style/Theme.NoTitleBar.Fullscreen" | ||
| android:allowBackup="true"> | ||
| <activity android:name=".MtNativeActivity" | ||
| android:label="${project}" | ||
| android:launchMode="singleTask" | ||
| android:configChanges="orientation|keyboard|keyboardHidden|navigation" | ||
| android:screenOrientation="sensorLandscape" | ||
| android:clearTaskOnLaunch="true"> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN" /> | ||
| <category android:name="android.intent.category.LAUNCHER" /> | ||
| </intent-filter> | ||
| <meta-data android:name="android.app.lib_name" android:value="minetest" /> | ||
| </activity> | ||
| <activity android:name=".MinetestTextEntry" | ||
| android:theme="@style/Theme.Transparent" | ||
| android:excludeFromRecents="true"> | ||
| </activity> | ||
| <activity android:name=".MinetestAssetCopy" | ||
| android:theme="@style/Theme.Transparent" | ||
| android:excludeFromRecents="true"> | ||
| </activity> | ||
| </application> | ||
| </manifest> |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <resources> | ||
| <string name="preparing_media">Preparing media...</string> | ||
| </resources> | ||
|
|
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters