Просмотр исходного кода

Restoring authorship annotation for <dmfedin@yandex-team.ru>. Commit 2 of 2.

dmfedin 3 лет назад
Родитель
Сommit
707ef321bf

+ 1 - 1
build/external_resources/android_sdk/ya.make

@@ -3,7 +3,7 @@ RESOURCES_LIBRARY()
 OWNER(g:mapkit)
 
 IF (OS_ANDROID)
-    # Android SDK for linux and darwin: Build-Tools 30.0.3, Platform 30 
+    # Android SDK for linux and darwin: Build-Tools 30.0.3, Platform 30
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
         ANDROID_SDK
         sbr:2564045529 FOR LINUX

+ 1 - 1
build/platform/android_sdk/ya.make

@@ -7,7 +7,7 @@ IF (NOT OS_ANDROID)
 ENDIF()
 
 IF (HOST_OS_LINUX)
-    # Android SDK for linux: Build-Tools 30.0.3, Platform 30 
+    # Android SDK for linux: Build-Tools 30.0.3, Platform 30
     DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
         ANDROID_SDK
         sbr:2564045529 FOR LINUX

+ 14 - 14
build/platform/qt/ya.make

@@ -6,25 +6,25 @@ IF (NOT QT_REQUIRED)
     MESSAGE(FATAL_ERROR "No QT Toolkit for your build")
 ELSE()
     IF (OS_LINUX)
-        # Qt version 5.15.2 for linux 
-        DECLARE_EXTERNAL_RESOURCE(QT sbr:2773138831) 
+        # Qt version 5.15.2 for linux
+        DECLARE_EXTERNAL_RESOURCE(QT sbr:2773138831)
     ELSEIF (OS_DARWIN)
-        CFLAGS(GLOBAL "-F$QT_RESOURCE_GLOBAL/lib") 
-        LDFLAGS("-F$QT_RESOURCE_GLOBAL/lib") 
-        # Qt version 5.15.2 for darwin 
-        DECLARE_EXTERNAL_RESOURCE(QT sbr:2773128565) 
+        CFLAGS(GLOBAL "-F$QT_RESOURCE_GLOBAL/lib")
+        LDFLAGS("-F$QT_RESOURCE_GLOBAL/lib")
+        # Qt version 5.15.2 for darwin
+        DECLARE_EXTERNAL_RESOURCE(QT sbr:2773128565)
+    ELSE()
+        ENABLE(QT_NOT_FOUND)
+    ENDIF()
+
+    IF (HOST_OS_LINUX)
+        DECLARE_EXTERNAL_RESOURCE(HOST_QT sbr:2773138831)
+    ELSEIF (HOST_OS_DARWIN)
+        DECLARE_EXTERNAL_RESOURCE(HOST_QT sbr:2773128565)
     ELSE()
         ENABLE(QT_NOT_FOUND)
     ENDIF()
 
-    IF (HOST_OS_LINUX) 
-        DECLARE_EXTERNAL_RESOURCE(HOST_QT sbr:2773138831) 
-    ELSEIF (HOST_OS_DARWIN) 
-        DECLARE_EXTERNAL_RESOURCE(HOST_QT sbr:2773128565) 
-    ELSE() 
-        ENABLE(QT_NOT_FOUND) 
-    ENDIF() 
- 
     IF (QT_NOT_FOUND)
         MESSAGE(FATAL_ERROR "No QT Toolkit for the selected platform")
     ELSE()

+ 3 - 3
build/scripts/gen_aar_gradle_script.py

@@ -50,9 +50,9 @@ ext.compileOnlyAndroidArs = [
 ]
 
 def minVersion = 21
-def compileVersion = 30 
-def targetVersion = 30 
-def buildVersion = '30.0.3' 
+def compileVersion = 30
+def targetVersion = 30
+def buildVersion = '30.0.3'
 
 import com.android.build.gradle.LibraryPlugin
 import java.nio.file.Files

+ 3 - 3
build/scripts/gen_test_apk_gradle_script.py

@@ -62,13 +62,13 @@ dependencies {{
 android {{
     {keystore}
 
-    compileSdkVersion 30 
-    buildToolsVersion "30.0.3" 
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
 
     defaultConfig {{
         minSdkVersion 21
-        targetSdkVersion 30 
+        targetSdkVersion 30
         applicationId "{app_id}"
     }}
 

+ 4 - 4
contrib/libs/curl/lib/curl_config-android-maps-mobile.h

@@ -1,9 +1,9 @@
 /* lib/curl_config.h.  Generated from curl_config.h.in by configure.  */
 /* lib/curl_config.h.in.  Generated from configure.ac by autoheader.  */
 
-// for SIZEOF_* macroses 
-#include <util/system/platform.h> 
- 
+// for SIZEOF_* macroses
+#include <util/system/platform.h>
+
 /* to enable curl debug memory tracking */
 /* #undef CURLDEBUG */
 
@@ -906,7 +906,7 @@
 #define SIZEOF_OFF_T 8
 
 /* The number of bytes in type time_t */
-#define SIZEOF_TIME_T SIZEOF_LONG 
+#define SIZEOF_TIME_T SIZEOF_LONG
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1

+ 4 - 4
contrib/libs/curl/lib/curl_config-ios-maps-mobile.h

@@ -1,9 +1,9 @@
 /* lib/curl_config.h.  Generated from curl_config.h.in by configure.  */
 /* lib/curl_config.h.in.  Generated from configure.ac by autoheader.  */
 
-// for SIZEOF_* macroses 
-#include <util/system/platform.h> 
- 
+// for SIZEOF_* macroses
+#include <util/system/platform.h>
+
 /* to enable curl debug memory tracking */
 /* #undef CURLDEBUG */
 
@@ -906,7 +906,7 @@
 #define SIZEOF_OFF_T 8
 
 /* The number of bytes in type time_t */
-#define SIZEOF_TIME_T SIZEOF_LONG 
+#define SIZEOF_TIME_T SIZEOF_LONG
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1

+ 5 - 5
contrib/libs/cxxsupp/system_stl/ya.make

@@ -14,15 +14,15 @@ NO_PLATFORM()
 
 ADDINCL(GLOBAL contrib/libs/cxxsupp/system_stl/include)
 
-IF (OS_IOS OR OS_DARWIN) 
+IF (OS_IOS OR OS_DARWIN)
     LDFLAGS(-lc++)
-ELSEIF (OS_ANDROID) 
-    IF (STATIC_STL) 
+ELSEIF (OS_ANDROID)
+    IF (STATIC_STL)
         LDFLAGS(-l:libc++.a)
-    ELSE() 
+    ELSE()
         LDFLAGS(-lc++)
     ENDIF()
-ELSE() 
+ELSE()
     CFLAGS(GLOBAL -DLIBCXX_BUILDING_LIBGCC)
     LDFLAGS(-lgcc_s)
 

+ 1 - 1
contrib/libs/openssl/crypto/armcap.c

@@ -101,7 +101,7 @@ static unsigned long getauxval(unsigned long key)
 #   include <sys/auxv.h>
 #   define OSSL_IMPLEMENT_GETAUXVAL
 #  endif
- 
+
 /*
  * ARM puts the feature bits for Crypto Extensions in AT_HWCAP2, whereas
  * AArch64 used AT_HWCAP.