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 | 9291888eab6dbfbcb4b67bf400c2713f5a65a472 (patch) | |
| tree | dbb385a54e02efd8677b7213ce9f66d4f199d932 /build | |
| parent | 84df690852777a25dce952fd28843ab49992eff3 (diff) | |
| download | ydb-9291888eab6dbfbcb4b67bf400c2713f5a65a472.tar.gz | |
Restoring authorship annotation for <dmfedin@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'build')
| -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 |
5 files changed, 22 insertions, 22 deletions
diff --git a/build/external_resources/android_sdk/ya.make b/build/external_resources/android_sdk/ya.make index bc01c12523..b0f1400727 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 1e726065da..66c424828b 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 750e319b84..b90e1a14f0 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) - 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) + 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 (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 4594e67278..53dc07380e 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 d1a78ceb1c..a66f5060b5 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}" }} |