diff options
author | dmfedin <dmfedin@yandex-team.ru> | 2022-02-10 16:47:58 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:58 +0300 |
commit | 707ef321bf057fe3d00103ed5b2c59bc1580f56c (patch) | |
tree | c0748b5dcbade83af788c0abfa89c0383d6b779c | |
parent | 9291888eab6dbfbcb4b67bf400c2713f5a65a472 (diff) | |
download | ydb-707ef321bf057fe3d00103ed5b2c59bc1580f56c.tar.gz |
Restoring authorship annotation for <dmfedin@yandex-team.ru>. Commit 2 of 2.
-rw-r--r-- | build/external_resources/android_sdk/ya.make | 2 | ||||
-rw-r--r-- | build/platform/android_sdk/ya.make | 2 | ||||
-rw-r--r-- | build/platform/qt/ya.make | 28 | ||||
-rw-r--r-- | build/scripts/gen_aar_gradle_script.py | 6 | ||||
-rw-r--r-- | build/scripts/gen_test_apk_gradle_script.py | 6 | ||||
-rw-r--r-- | contrib/libs/curl/lib/curl_config-android-maps-mobile.h | 8 | ||||
-rw-r--r-- | contrib/libs/curl/lib/curl_config-ios-maps-mobile.h | 8 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/system_stl/ya.make | 10 | ||||
-rw-r--r-- | contrib/libs/openssl/crypto/armcap.c | 2 |
9 files changed, 36 insertions, 36 deletions
diff --git a/build/external_resources/android_sdk/ya.make b/build/external_resources/android_sdk/ya.make index b0f1400727..bc01c12523 100644 --- a/build/external_resources/android_sdk/ya.make +++ b/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 diff --git a/build/platform/android_sdk/ya.make b/build/platform/android_sdk/ya.make index 66c424828b..1e726065da 100644 --- a/build/platform/android_sdk/ya.make +++ b/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 diff --git a/build/platform/qt/ya.make b/build/platform/qt/ya.make index b90e1a14f0..750e319b84 100644 --- a/build/platform/qt/ya.make +++ b/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() diff --git a/build/scripts/gen_aar_gradle_script.py b/build/scripts/gen_aar_gradle_script.py index 53dc07380e..4594e67278 100644 --- a/build/scripts/gen_aar_gradle_script.py +++ b/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 diff --git a/build/scripts/gen_test_apk_gradle_script.py b/build/scripts/gen_test_apk_gradle_script.py index a66f5060b5..d1a78ceb1c 100644 --- a/build/scripts/gen_test_apk_gradle_script.py +++ b/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}" }} diff --git a/contrib/libs/curl/lib/curl_config-android-maps-mobile.h b/contrib/libs/curl/lib/curl_config-android-maps-mobile.h index 8e6c518563..0a56d2496f 100644 --- a/contrib/libs/curl/lib/curl_config-android-maps-mobile.h +++ b/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 diff --git a/contrib/libs/curl/lib/curl_config-ios-maps-mobile.h b/contrib/libs/curl/lib/curl_config-ios-maps-mobile.h index 02195fc04d..b51776686d 100644 --- a/contrib/libs/curl/lib/curl_config-ios-maps-mobile.h +++ b/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 diff --git a/contrib/libs/cxxsupp/system_stl/ya.make b/contrib/libs/cxxsupp/system_stl/ya.make index 47066cf99c..75317898ac 100644 --- a/contrib/libs/cxxsupp/system_stl/ya.make +++ b/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) diff --git a/contrib/libs/openssl/crypto/armcap.c b/contrib/libs/openssl/crypto/armcap.c index e596607f12..a96804c706 100644 --- a/contrib/libs/openssl/crypto/armcap.c +++ b/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. |