Android: Fix gradle assembly

master
MoNTE48 2018-07-20 13:26:38 +02:00
parent 8a4933f707
commit f1ac8c101d
6 changed files with 22 additions and 26 deletions

View File

@ -652,7 +652,7 @@ apk: local.properties $(IRRLICHT_LIB) $(CURL_LIB) $(LEVELDB_LIB) $(LUAJIT_LIB)
fi; \
export VERSION_STR="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" && \
export BUILD_TYPE_C=$$(echo "$${BUILD_TYPE}" | sed 's/./\U&/') && \
# gradle assemble$$BUILD_TYPE_C && \
./gradlew assemble$$BUILD_TYPE_C && \
echo "APK stored at: build/outputs/apk/MultiCraft-$$BUILD_TYPE.apk" && \
echo "You can install it with \`make install_$$BUILD_TYPE\`"
@ -671,7 +671,7 @@ prep_srcdir :
fi
clean_apk :
# gradle clean
./gradlew clean
clean_all :
@$(MAKE) clean_apk; \

View File

@ -1,24 +1,21 @@
buildscript {
repositories {
maven { url 'https://maven.google.com' }
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.3'
}
}
allprojects {
repositories {
maven { url 'https://maven.google.com' }
jcenter()
}
}
task clean(type: Delete) {
delete rootProject.buildDir
}
apply plugin: 'com.android.application'
android {
compileSdkVersion 27
buildToolsVersion "27.0.3"
@ -27,6 +24,7 @@ android {
applicationId "mobi.MultiCraft"
minSdkVersion 16
targetSdkVersion 27
versionCode 92
}
Properties props = new Properties()
props.load(new FileInputStream(file("local.properties")))
@ -41,8 +39,10 @@ android {
}
}
buildTypes {
release {
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
signingConfig signingConfigs.release
}
}
@ -73,7 +73,5 @@ android.applicationVariants.all { variant ->
}
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:support-compat:27.1.1'
}

Binary file not shown.

View File

@ -1,6 +1,5 @@
#Sat Aug 27 20:10:09 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

View File

@ -44,17 +44,6 @@ ifdef GPROF
GPROF_DEF=-DGPROF
endif
LOCAL_CFLAGS := \
-DJSONCPP_NO_LOCALE_SUPPORT \
-DHAVE_TOUCHSCREENGUI \
-DUSE_CURL=1 \
-DUSE_SOUND=1 \
-DUSE_FREETYPE=1 \
-DUSE_GETTEXT=1 \
-DUSE_LEVELDB=1 \
$(GPROF_DEF) \
-pipe
ifeq ($(TARGET_ABI),armeabi-v7a)
LOCAL_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb
endif
@ -67,6 +56,17 @@ ifndef NDEBUG
LOCAL_CFLAGS := -g -D_DEBUG -O0 -fno-omit-frame-pointer
endif
LOCAL_CFLAGS := \
-DJSONCPP_NO_LOCALE_SUPPORT \
-DHAVE_TOUCHSCREENGUI \
-DUSE_CURL=1 \
-DUSE_SOUND=1 \
-DUSE_FREETYPE=1 \
-DUSE_GETTEXT=1 \
-DUSE_LEVELDB=1 \
$(GPROF_DEF) \
-pipe
ifdef GPROF
PROFILER_LIBS := android-ndk-profiler
LOCAL_CFLAGS += -pg

View File

@ -1 +0,0 @@
rootProject.name = "MultiCraft"