Update to 3.13.1

hamedahmadi123 · Oct 11, 2016 · e313885 · e313885
1 parent 55463a9
commit e313885
Show file tree

Hide file tree

Showing 862 changed files with 36,679 additions and 36,528 deletions.
diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
@@ -4,21 +4,36 @@ repositories {
     mavenCentral()
 }
 
+configurations {
+    compile.exclude module: 'support-v4'
+}
+
 dependencies {
-    compile 'com.android.support:support-v4:23.4.0'
-    compile "com.google.android.gms:play-services-gcm:8.4.0"
-    compile "com.google.android.gms:play-services-maps:8.4.0"
+    compile 'com.google.android.gms:play-services-gcm:9.6.1'
+    compile 'com.google.android.gms:play-services-maps:9.6.1'
+    compile 'com.google.android.gms:play-services-vision:9.6.1'
+    compile 'com.android.support:support-core-ui:24.2.1'
+    compile 'com.android.support:support-compat:24.2.1'
+    compile 'com.android.support:support-core-utils:24.2.1'
     compile 'net.hockeyapp.android:HockeySDK:4.0.1'
     compile 'com.googlecode.mp4parser:isoparser:1.0.6'
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '23.0.3'
+    compileSdkVersion 24
+    buildToolsVersion '24.0.2'
 
     useLibrary 'org.apache.http.legacy'
     defaultConfig.applicationId = "org.telegram.messenger"
 
+    sourceSets.main.jniLibs.srcDirs = ['./jni/']
+
+    externalNativeBuild {
+        ndkBuild {
+            path "jni/Android.mk"
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
@@ -30,13 +45,15 @@ android {
             storePassword RELEASE_STORE_PASSWORD
             keyAlias RELEASE_KEY_ALIAS
             keyPassword RELEASE_KEY_PASSWORD
+            v2SigningEnabled false
         }
 
         release {
             storeFile file("config/release.keystore")
             storePassword RELEASE_STORE_PASSWORD
             keyAlias RELEASE_KEY_ALIAS
             keyPassword RELEASE_KEY_PASSWORD
+            v2SigningEnabled false
         }
     }
 
@@ -63,12 +80,7 @@ android {
         }
     }
 
-    defaultConfig.versionCode = 821
-
-    sourceSets.main {
-        jniLibs.srcDir 'libs'
-        jni.srcDirs = [] //disable automatic ndk-build call
-    }
+    defaultConfig.versionCode = 851
 
     sourceSets.debug {
         manifest.srcFile 'config/debug/AndroidManifest.xml'
@@ -89,12 +101,6 @@ android {
             }
             versionCode = 2
         }
-        arm {
-            ndk {
-                abiFilter "armeabi"
-            }
-            versionCode = 0
-        }
         armv7 {
             ndk {
                 abiFilter "armeabi-v7a"
@@ -113,8 +119,15 @@ android {
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 23
-        versionName "3.10.1"
+        targetSdkVersion 24
+        versionName "3.13.1"
+
+        externalNativeBuild {
+            ndkBuild {
+                arguments "NDK_APPLICATION_MK:=jni/Application.mk", "APP_PLATFORM:=android-14"
+                abiFilters "armeabi-v7a", "x86"
+            }
+        }
     }
 }
 

diff --git a/TMessagesProj/google-services.json b/TMessagesProj/google-services.json
diff --git a/TMessagesProj/jni/Android.mk b/TMessagesProj/jni/Android.mk
@@ -78,8 +78,8 @@ LOCAL_MODULE := breakpad
 LOCAL_CPPFLAGS := -Wall -std=c++11 -DANDROID -finline-functions -ffast-math -Os -fno-strict-aliasing
 
 LOCAL_C_INCLUDES := \
-./breakpad/common/android/include \
-./breakpad
+./jni/breakpad/common/android/include \
+./jni/breakpad
 
 LOCAL_SRC_FILES := \
 ./breakpad/client/linux/crash_generation/crash_generation_client.cc \
@@ -108,13 +108,14 @@ include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 
-LOCAL_CPPFLAGS := -Wall -std=c++11 -DANDROID -frtti -DHAVE_PTHREAD -finline-functions -ffast-math -Os
-LOCAL_C_INCLUDES += ./boringssl/include/
+LOCAL_CPPFLAGS := -Wall -std=c++11 -DANDROID -frtti -DHAVE_PTHREAD -finline-functions -ffast-math -O0
+LOCAL_C_INCLUDES += ./jni/boringssl/include/
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE := tgnet
 LOCAL_STATIC_LIBRARIES := crypto
 
 LOCAL_SRC_FILES := \
+./tgnet/ApiScheme.cpp \
 ./tgnet/BuffersStorage.cpp \
 ./tgnet/ByteArray.cpp \
 ./tgnet/ByteStream.cpp \
@@ -130,14 +131,15 @@ LOCAL_SRC_FILES := \
 ./tgnet/Request.cpp \
 ./tgnet/Timer.cpp \
 ./tgnet/TLObject.cpp \
+./tgnet/FileLoadOperation.cpp \
 ./tgnet/Config.cpp
 
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 
-LOCAL_CFLAGS := -Wall -DANDROID -DHAVE_MALLOC_H -DHAVE_PTHREAD -DWEBP_USE_THREAD -finline-functions -ffast-math -ffunction-sections -fdata-sections -Os
-LOCAL_C_INCLUDES += ./libwebp/src
+LOCAL_CFLAGS := -Wall -DANDROID -DHAVE_MALLOC_H -DHAVE_PTHREAD -DWEBP_USE_THREAD -finline-functions -ffast-math -ffunction-sections -fdata-sections -O0
+LOCAL_C_INCLUDES += ./jni/libwebp/src
 LOCAL_ARM_MODE := arm
 LOCAL_STATIC_LIBRARIES := cpufeatures
 LOCAL_MODULE := webp
@@ -235,7 +237,7 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_PRELINK_MODULE := false
 
-LOCAL_MODULE 	:= tmessages.22
+LOCAL_MODULE 	:= tmessages.24
 LOCAL_CFLAGS 	:= -w -std=c11 -Os -DNULL=0 -DSOCKLEN_T=socklen_t -DLOCALE_NOT_USED -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
 LOCAL_CFLAGS 	+= -Drestrict='' -D__EMX__ -DOPUS_BUILD -DFIXED_POINT -DUSE_ALLOCA -DHAVE_LRINT -DHAVE_LRINTF -fno-math-errno
 LOCAL_CFLAGS 	+= -DANDROID_NDK -DDISABLE_IMPORTGL -fno-strict-aliasing -fprefetch-loop-arrays -DAVOID_TABLES -DANDROID_TILE_BASED_DECODE -DANDROID_ARMV6_IDCT -ffast-math -D__STDC_CONSTANT_MACROS
@@ -265,8 +267,8 @@ else
 
     else
         ifeq ($(TARGET_ARCH_ABI),x86)
-	    LOCAL_CPPFLAGS += -Dx86fix
 	    LOCAL_CFLAGS += -Dx86fix
+ 	    LOCAL_CPPFLAGS += -Dx86fix
 	    LOCAL_ARM_MODE  := arm
 	    LOCAL_SRC_FILE += \
 	    ./libyuv/source/row_x86.asm
@@ -410,66 +412,17 @@ LOCAL_SRC_FILES     += \
 ./opus/opusfile/stream.c
 
 LOCAL_C_INCLUDES    := \
-./opus/include \
-./opus/silk \
-./opus/silk/fixed \
-./opus/celt \
-./opus/ \
-./opus/opusfile \
-./libyuv/include \
-./boringssl/include \
-./breakpad/common/android/include \
-./breakpad \
-./ffmpeg/include
-
-LOCAL_SRC_FILES     += \
-./libjpeg/jcapimin.c \
-./libjpeg/jcapistd.c \
-./libjpeg/armv6_idct.S \
-./libjpeg/jccoefct.c \
-./libjpeg/jccolor.c \
-./libjpeg/jcdctmgr.c \
-./libjpeg/jchuff.c \
-./libjpeg/jcinit.c \
-./libjpeg/jcmainct.c \
-./libjpeg/jcmarker.c \
-./libjpeg/jcmaster.c \
-./libjpeg/jcomapi.c \
-./libjpeg/jcparam.c \
-./libjpeg/jcphuff.c \
-./libjpeg/jcprepct.c \
-./libjpeg/jcsample.c \
-./libjpeg/jctrans.c \
-./libjpeg/jdapimin.c \
-./libjpeg/jdapistd.c \
-./libjpeg/jdatadst.c \
-./libjpeg/jdatasrc.c \
-./libjpeg/jdcoefct.c \
-./libjpeg/jdcolor.c \
-./libjpeg/jddctmgr.c \
-./libjpeg/jdhuff.c \
-./libjpeg/jdinput.c \
-./libjpeg/jdmainct.c \
-./libjpeg/jdmarker.c \
-./libjpeg/jdmaster.c \
-./libjpeg/jdmerge.c \
-./libjpeg/jdphuff.c \
-./libjpeg/jdpostct.c \
-./libjpeg/jdsample.c \
-./libjpeg/jdtrans.c \
-./libjpeg/jerror.c \
-./libjpeg/jfdctflt.c \
-./libjpeg/jfdctfst.c \
-./libjpeg/jfdctint.c \
-./libjpeg/jidctflt.c \
-./libjpeg/jidctfst.c \
-./libjpeg/jidctint.c \
-./libjpeg/jidctred.c \
-./libjpeg/jmemmgr.c \
-./libjpeg/jmemnobs.c \
-./libjpeg/jquant1.c \
-./libjpeg/jquant2.c \
-./libjpeg/jutils.c
+./jni/opus/include \
+./jni/opus/silk \
+./jni/opus/silk/fixed \
+./jni/opus/celt \
+./jni/opus/ \
+./jni/opus/opusfile \
+./jni/libyuv/include \
+./jni/boringssl/include \
+./jni/breakpad/common/android/include \
+./jni/breakpad \
+./jni/ffmpeg/include
 
 LOCAL_SRC_FILES     += \
 ./libyuv/source/compare_common.cc \

diff --git a/TMessagesProj/jni/Application.mk b/TMessagesProj/jni/Application.mk
@@ -1,4 +1,4 @@
 APP_PLATFORM := android-9
-APP_ABI := armeabi armeabi-v7a x86
+APP_ABI := armeabi armeabi-v7a
 NDK_TOOLCHAIN_VERSION := 4.9
 APP_STL := gnustl_static