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

8 files changed, 87 insertions, 87 deletions

diff --git a/build/external_resources/gradle/ya.make b/build/external_resources/gradle/ya.make
index 5cdba58f0b..579d41e50e 100644
--- a/build/external_resources/gradle/ya.make
+++ b/build/external_resources/gradle/ya.make
@@ -2,10 +2,10 @@ RESOURCES_LIBRARY()
 
 OWNER(g:mapkit)
 
-# Gradle 6.1.1 
-# Build time:   2020-01-24 22:30:24 UTC 
-# Revision:     a8c3750babb99d1894378073499d6716a1a1fa5d 
-DECLARE_EXTERNAL_RESOURCE(GRADLE sbr:2566840956) 
+# Gradle 6.1.1
+# Build time:   2020-01-24 22:30:24 UTC
+# Revision:     a8c3750babb99d1894378073499d6716a1a1fa5d
+DECLARE_EXTERNAL_RESOURCE(GRADLE sbr:2566840956)
 DECLARE_EXTERNAL_RESOURCE(GRADLE_DEBUG_STORE sbr:1192738881)
 
 END()
diff --git a/build/external_resources/mapsmobi_ios_pods/ya.make b/build/external_resources/mapsmobi_ios_pods/ya.make
index c0ab2a3dae..a733c6beb4 100644
--- a/build/external_resources/mapsmobi_ios_pods/ya.make
+++ b/build/external_resources/mapsmobi_ios_pods/ya.make
@@ -3,7 +3,7 @@ RESOURCES_LIBRARY()
 OWNER(g:mapkit)
 
 IF (OS_IOS)
-    DECLARE_EXTERNAL_RESOURCE(MAPSMOBI_IOS_PODS sbr:2586181384) 
+    DECLARE_EXTERNAL_RESOURCE(MAPSMOBI_IOS_PODS sbr:2586181384)
     CFLAGS(GLOBAL "-I$MAPSMOBI_IOS_PODS_RESOURCE_GLOBAL/Pods/Headers/Public")
 ELSE()
     MESSAGE(FATAL_ERROR Unsupported platform)
diff --git a/build/external_resources/mapsmobi_maven_repo/ya.make b/build/external_resources/mapsmobi_maven_repo/ya.make
index 48ffccb969..2487263d6b 100644
--- a/build/external_resources/mapsmobi_maven_repo/ya.make
+++ b/build/external_resources/mapsmobi_maven_repo/ya.make
@@ -3,7 +3,7 @@ RESOURCES_LIBRARY()
 OWNER(g:mapkit)
 
 IF (OS_ANDROID)
-    DECLARE_EXTERNAL_RESOURCE(MAPSMOBI_MAVEN_REPO sbr:2586526945) 
+    DECLARE_EXTERNAL_RESOURCE(MAPSMOBI_MAVEN_REPO sbr:2586526945)
 ELSE()
     MESSAGE(FATAL_ERROR Unsupported platform)
 ENDIF()
diff --git a/build/platform/ios_sdk/ya.make b/build/platform/ios_sdk/ya.make
index 2054370aaf..b1246a70b9 100644
--- a/build/platform/ios_sdk/ya.make
+++ b/build/platform/ios_sdk/ya.make
@@ -4,12 +4,12 @@ OWNER(somov)
 
 SET(NEED_PLATFORM_PEERDIRS no)
 
-IF (OS_IOS AND NOT OS_IOSSIM) 
-    # iOS 14.5 SDK / Xcode 12.5.1 (12E507) 
-    DECLARE_EXTERNAL_RESOURCE(IOS_SDK_ROOT sbr:2661782168) 
-ELSEIF (OS_IOSSIM) 
-    # iOS Simulator 14.5 SDK / Xcode 12.5.1 (12E507) 
-    DECLARE_EXTERNAL_RESOURCE(IOS_SDK_ROOT sbr:2661786760) 
+IF (OS_IOS AND NOT OS_IOSSIM)
+    # iOS 14.5 SDK / Xcode 12.5.1 (12E507)
+    DECLARE_EXTERNAL_RESOURCE(IOS_SDK_ROOT sbr:2661782168)
+ELSEIF (OS_IOSSIM)
+    # iOS Simulator 14.5 SDK / Xcode 12.5.1 (12E507)
+    DECLARE_EXTERNAL_RESOURCE(IOS_SDK_ROOT sbr:2661786760)
 ELSE()
     MESSAGE(FATAL_ERROR "There is no iOS SDK for the selected target platform")
 ENDIF()
diff --git a/build/platform/mapkit/ya.make b/build/platform/mapkit/ya.make
index 861cacbf8b..513dff5bcf 100644
--- a/build/platform/mapkit/ya.make
+++ b/build/platform/mapkit/ya.make
@@ -8,11 +8,11 @@ IF (OS_ANDROID)
     IF (MAPS_MOBILE_EXPORT_CPP_API)
         # Sandbox Resource ID duplicates
         # arcadia/sandbox/projects/maps/mobile/MapsMobileMakeArtifacts/__init__.py
-        DECLARE_EXTERNAL_RESOURCE(MAPKIT_ANDROID_LIBCXX_HEADERS sbr:2527848662) 
+        DECLARE_EXTERNAL_RESOURCE(MAPKIT_ANDROID_LIBCXX_HEADERS sbr:2527848662)
         CFLAGS(GLOBAL -nostdinc++ GLOBAL -cxx-isystem GLOBAL $MAPKIT_ANDROID_LIBCXX_HEADERS_RESOURCE_GLOBAL)
     ENDIF()
 
-    DECLARE_EXTERNAL_RESOURCE(MAPKIT_ANDROID_LIBCXX_LIBRARIES sbr:2527853263) 
+    DECLARE_EXTERNAL_RESOURCE(MAPKIT_ANDROID_LIBCXX_LIBRARIES sbr:2527853263)
 
     IF (ARCH_ARM7)
         SET(ARCH_NAME arm)
diff --git a/build/scripts/gen_aar_gradle_script.py b/build/scripts/gen_aar_gradle_script.py
index b9da55266f..4594e67278 100644
--- a/build/scripts/gen_aar_gradle_script.py
+++ b/build/scripts/gen_aar_gradle_script.py
@@ -80,7 +80,7 @@ buildscript {{
     }}
 
     dependencies {{
-        classpath 'com.android.tools.build:gradle:4.0.2' 
+        classpath 'com.android.tools.build:gradle:4.0.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
     }}
 }}
@@ -143,13 +143,13 @@ android {{
             compileOnly(bundle)
     }}
 
-    android.libraryVariants.all {{ variant -> 
-        def suffix = variant.buildType.name.capitalize() 
- 
-        def sourcesJarTask = project.tasks.create(name: "sourcesJar${{suffix}}", type: Jar) {{ 
-            classifier = 'sources' 
-            from android.sourceSets.main.java.srcDirs 
-            include '**/*.java' 
+    android.libraryVariants.all {{ variant ->
+        def suffix = variant.buildType.name.capitalize()
+
+        def sourcesJarTask = project.tasks.create(name: "sourcesJar${{suffix}}", type: Jar) {{
+            classifier = 'sources'
+            from android.sourceSets.main.java.srcDirs
+            include '**/*.java'
             eachFile {{ fcd ->
                 def segments = fcd.relativePath.segments
                 if (segments[0] == 'impl') {{
@@ -159,27 +159,27 @@ android {{
             includeEmptyDirs = false
         }}
 
-        def manifestFile = android.sourceSets.main.manifest.srcFile 
-        def manifestXml = new XmlParser().parse(manifestFile) 
+        def manifestFile = android.sourceSets.main.manifest.srcFile
+        def manifestXml = new XmlParser().parse(manifestFile)
 
-        def packageName = manifestXml['@package'] 
+        def packageName = manifestXml['@package']
         def groupName = packageName.tokenize('.')[0..-2].join('.')
 
-        def androidNs = new groovy.xml.Namespace("http://schemas.android.com/apk/res/android") 
-        def packageVersion = manifestXml.attributes()[androidNs.versionName] 
-
-        def writePomTask = project.tasks.create(name: "writePom${{suffix}}") {{ 
-            pom {{ 
-                project {{ 
-                    groupId groupName 
-                    version packageVersion 
-                    packaging 'aar' 
-                }} 
-            }}.writeTo("$buildDir/${{rootProject.name}}$packageSuffix-pom.xml") 
-        }} 
-
-        tasks["bundle${{suffix}}Aar"].dependsOn sourcesJarTask 
-        tasks["bundle${{suffix}}Aar"].dependsOn writePomTask 
+        def androidNs = new groovy.xml.Namespace("http://schemas.android.com/apk/res/android")
+        def packageVersion = manifestXml.attributes()[androidNs.versionName]
+
+        def writePomTask = project.tasks.create(name: "writePom${{suffix}}") {{
+            pom {{
+                project {{
+                    groupId groupName
+                    version packageVersion
+                    packaging 'aar'
+                }}
+            }}.writeTo("$buildDir/${{rootProject.name}}$packageSuffix-pom.xml")
+        }}
+
+        tasks["bundle${{suffix}}Aar"].dependsOn sourcesJarTask
+        tasks["bundle${{suffix}}Aar"].dependsOn writePomTask
     }}
 
     android.libraryVariants.all {{ variant ->
@@ -309,16 +309,16 @@ def gen_build_script(args):
         aars=wrap(args.aars),
         compile_only_aars=wrap(args.compile_only_aars),
         aidl_dirs=wrap(args.aidl_dirs),
-        assets_dirs=wrap(args.assets_dirs), 
+        assets_dirs=wrap(args.assets_dirs),
         bundles=wrap(bundles),
         do_not_strip=do_not_strip,
         enable_javadoc=enable_javadoc,
         flat_dirs_repo=flat_dirs_repo,
-        java_dirs=wrap(args.java_dirs), 
+        java_dirs=wrap(args.java_dirs),
         jni_libs_dirs=wrap(args.jni_libs_dirs),
         keystore=keystore,
-        manifest=args.manifest, 
-        maven_repos=maven_repos, 
+        manifest=args.manifest,
+        maven_repos=maven_repos,
         proguard_rules=args.proguard_rules,
         res_dirs=wrap(args.res_dirs),
     )
@@ -328,7 +328,7 @@ if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument('--aars', nargs='*', default=[])
     parser.add_argument('--compile-only-aars', nargs='*', default=[])
-    parser.add_argument('--aidl-dirs', nargs='*', default=[]) 
+    parser.add_argument('--aidl-dirs', nargs='*', default=[])
     parser.add_argument('--assets-dirs', nargs='*', default=[])
     parser.add_argument('--bundle-name', nargs='?', default='default-bundle-name')
     parser.add_argument('--bundles', nargs='*', default=[])
@@ -360,15 +360,15 @@ if __name__ == '__main__':
 
     args.build_gradle = os.path.join(args.output_dir, 'build.gradle')
     args.settings_gradle = os.path.join(args.output_dir, 'settings.gradle')
-    args.gradle_properties = os.path.join(args.output_dir, 'gradle.properties') 
+    args.gradle_properties = os.path.join(args.output_dir, 'gradle.properties')
 
     content = gen_build_script(args)
     with open(args.build_gradle, 'w') as f:
         f.write(content)
 
-    with open(args.gradle_properties, 'w') as f: 
-        f.write('android.useAndroidX=true') 
- 
+    with open(args.gradle_properties, 'w') as f:
+        f.write('android.useAndroidX=true')
+
     if args.bundle_name:
         with open(args.settings_gradle, 'w') as f:
             f.write('rootProject.name = "{}"'.format(args.bundle_name))
diff --git a/build/scripts/gen_test_apk_gradle_script.py b/build/scripts/gen_test_apk_gradle_script.py
index 1177070176..d1a78ceb1c 100644
--- a/build/scripts/gen_test_apk_gradle_script.py
+++ b/build/scripts/gen_test_apk_gradle_script.py
@@ -31,7 +31,7 @@ buildscript {{
     }}
 
     dependencies {{
-        classpath 'com.android.tools.build:gradle:3.5.3' 
+        classpath 'com.android.tools.build:gradle:3.5.3'
     }}
 }}
 
@@ -83,17 +83,17 @@ android {{
 
     applicationVariants.all {{ variant ->
         variant.outputs.each {{ output ->
-            def fileName = "$projectDir/output/{app_id}.apk" 
-            output.outputFileName = new File(output.outputFile.parent, fileName).getName() 
+            def fileName = "$projectDir/output/{app_id}.apk"
+            output.outputFileName = new File(output.outputFile.parent, fileName).getName()
         }}
     }}
 
     dependencies {{
-        implementation 'com.google.android.gms:play-services-location:16.0.0' 
-        implementation 'com.google.android.gms:play-services-gcm:16.0.0' 
-        implementation 'com.evernote:android-job:1.2.6' 
-        implementation 'androidx.annotation:annotation:1.1.0' 
-        implementation 'androidx.core:core:1.1.0' 
+        implementation 'com.google.android.gms:play-services-location:16.0.0'
+        implementation 'com.google.android.gms:play-services-gcm:16.0.0'
+        implementation 'com.evernote:android-job:1.2.6'
+        implementation 'androidx.annotation:annotation:1.1.0'
+        implementation 'androidx.core:core:1.1.0'
     }}
 }}
 """
@@ -173,17 +173,17 @@ if __name__ == '__main__':
 
     args.build_gradle = os.path.join(args.output_dir, 'build.gradle')
     args.settings_gradle = os.path.join(args.output_dir, 'settings.gradle')
-    args.gradle_properties = os.path.join(args.output_dir, 'gradle.properties') 
+    args.gradle_properties = os.path.join(args.output_dir, 'gradle.properties')
 
     content = gen_build_script(args)
     with open(args.build_gradle, 'w') as f:
         f.write(content)
 
-    with open(args.gradle_properties, 'w') as f: 
-        f.write('''android.enableJetifier=true 
-        android.useAndroidX=true 
-        org.gradle.jvmargs=-Xmx8192m -XX:MaxPermSize=512m''') 
- 
+    with open(args.gradle_properties, 'w') as f:
+        f.write('''android.enableJetifier=true
+        android.useAndroidX=true
+        org.gradle.jvmargs=-Xmx8192m -XX:MaxPermSize=512m''')
+
     if args.bundle_name:
         with open(args.settings_gradle, 'w') as f:
             f.write('rootProject.name = "{}"'.format(args.bundle_name))
diff --git a/build/ymake_conf.py b/build/ymake_conf.py
index d5ea94adb9..30219eb85e 100755
--- a/build/ymake_conf.py
+++ b/build/ymake_conf.py
@@ -95,9 +95,9 @@ class Platform(object):
         self.is_macos = self.os == 'macos'
         self.is_macos_x86_64 = self.is_macos and self.is_x86_64
         self.is_macos_arm64 = self.is_macos and self.is_arm64
-        self.is_iossim = self.os == 'iossim' or (self.os == 'ios' and self.is_intel) 
-        self.is_ios = self.os == 'ios' or self.is_iossim 
-        self.is_apple = self.is_macos or self.is_ios 
+        self.is_iossim = self.os == 'iossim' or (self.os == 'ios' and self.is_intel)
+        self.is_ios = self.os == 'ios' or self.is_iossim
+        self.is_apple = self.is_macos or self.is_ios
 
         self.is_windows = self.os == 'windows'
         self.is_windows_x86_64 = self.is_windows and self.is_x86_64
@@ -141,7 +141,7 @@ class Platform(object):
         if self.is_iossim:
             yield 'IOS'
             yield 'OS_IOS'
-            yield 'OS_IOSSIM' 
+            yield 'OS_IOSSIM'
 
     @property
     def arch_variables(self):
@@ -1129,21 +1129,21 @@ class GnuToolchain(Toolchain):
             for lib_path in build.host.library_path_variables:
                 self.env.setdefault(lib_path, []).append('{}/lib'.format(self.tc.name_marker))
 
-        macos_version_min = '10.11' 
-        macos_arm64_version_min = '11.0' 
-        ios_version_min = '11.0' 
-        # min ios simulator version for Metal App is 13.0 
-        # https://developer.apple.com/documentation/metal/supporting_simulator_in_a_metal_app 
-        # Mapkit (MAPSMOBI_BUILD_TARGET) uses Metal Framework 
-        if preset('MAPSMOBI_BUILD_TARGET') and target.is_iossim and target.is_armv8: 
-            ios_version_min = '13.0' 
- 
+        macos_version_min = '10.11'
+        macos_arm64_version_min = '11.0'
+        ios_version_min = '11.0'
+        # min ios simulator version for Metal App is 13.0
+        # https://developer.apple.com/documentation/metal/supporting_simulator_in_a_metal_app
+        # Mapkit (MAPSMOBI_BUILD_TARGET) uses Metal Framework
+        if preset('MAPSMOBI_BUILD_TARGET') and target.is_iossim and target.is_armv8:
+            ios_version_min = '13.0'
+
         swift_target = select(default=None, selectors=[
-            (target.is_iossim and target.is_x86_64, 'x86_64-apple-ios{}-simulator'.format(ios_version_min)), 
-            (target.is_iossim and target.is_x86, 'i386-apple-ios{}-simulator'.format(ios_version_min)), 
-            (target.is_iossim and target.is_armv8, 'arm64-apple-ios{}-simulator'.format(ios_version_min)), 
-            (not target.is_iossim and target.is_ios and target.is_armv8, 'arm64-apple-ios9'), 
-            (not target.is_iossim and target.is_ios and target.is_armv7, 'armv7-apple-ios9'), 
+            (target.is_iossim and target.is_x86_64, 'x86_64-apple-ios{}-simulator'.format(ios_version_min)),
+            (target.is_iossim and target.is_x86, 'i386-apple-ios{}-simulator'.format(ios_version_min)),
+            (target.is_iossim and target.is_armv8, 'arm64-apple-ios{}-simulator'.format(ios_version_min)),
+            (not target.is_iossim and target.is_ios and target.is_armv8, 'arm64-apple-ios9'),
+            (not target.is_iossim and target.is_ios and target.is_armv7, 'armv7-apple-ios9'),
         ])
         if swift_target:
             self.swift_flags_platform += ['-target', swift_target]
@@ -1151,7 +1151,7 @@ class GnuToolchain(Toolchain):
         if self.tc.is_from_arcadia:
             self.swift_lib_path = select(default=None, selectors=[
                 (host.is_macos and target.is_iossim, '$SWIFT_XCODE_TOOLCHAIN_ROOT_RESOURCE_GLOBAL/usr/lib/swift/iphonesimulator'),
-                (host.is_macos and not target.is_iossim and target.is_ios and (target.is_armv8 or target.is_armv7), '$SWIFT_XCODE_TOOLCHAIN_ROOT_RESOURCE_GLOBAL/usr/lib/swift/iphoneos'), 
+                (host.is_macos and not target.is_iossim and target.is_ios and (target.is_armv8 or target.is_armv7), '$SWIFT_XCODE_TOOLCHAIN_ROOT_RESOURCE_GLOBAL/usr/lib/swift/iphoneos'),
             ])
 
         if self.tc.is_clang:
@@ -1163,7 +1163,7 @@ class GnuToolchain(Toolchain):
                     (target.is_linux and target.is_armv7 and target.armv7_float_abi == 'hard', 'arm-linux-gnueabihf'),
                     (target.is_linux and target.is_armv7 and target.armv7_float_abi == 'softfp', 'arm-linux-gnueabi'),
                     (target.is_linux and target.is_powerpc, 'powerpc64le-linux-gnu'),
-                    (target.is_iossim and target.is_arm64, 'arm64-apple-ios{}-simulator'.format(ios_version_min)), 
+                    (target.is_iossim and target.is_arm64, 'arm64-apple-ios{}-simulator'.format(ios_version_min)),
                     (target.is_apple and target.is_x86, 'i386-apple-darwin14'),
                     (target.is_apple and target.is_x86_64, 'x86_64-apple-darwin14'),
                     (target.is_apple and target.is_macos_arm64, 'arm64-apple-macos11'),
@@ -1233,12 +1233,12 @@ class GnuToolchain(Toolchain):
             if target_flags:
                 self.c_flags_platform.extend(target_flags)
 
-            if target.is_ios: 
+            if target.is_ios:
                 self.c_flags_platform.append('-D__IOS__=1')
 
             if self.tc.is_from_arcadia:
                 if target.is_apple:
-                    if target.is_ios: 
+                    if target.is_ios:
                         self.setup_sdk(project='build/platform/ios_sdk', var='${IOS_SDK_ROOT_RESOURCE_GLOBAL}')
                         self.platform_projects.append('build/platform/macos_system_stl')
                     if target.is_macos:
@@ -1934,8 +1934,8 @@ class LD(Linker):
         self.ld_sdk = select(default=None, selectors=[
             (target.is_macos_arm64, '-Wl,-sdk_version,11.0'),
             (target.is_macos, '-Wl,-sdk_version,10.15'),
-            (not target.is_iossim and target.is_ios, '-Wl,-sdk_version,13.1'), 
-            (target.is_iossim, '-Wl,-sdk_version,14.5'), 
+            (not target.is_iossim and target.is_ios, '-Wl,-sdk_version,13.1'),
+            (target.is_iossim, '-Wl,-sdk_version,14.5'),
         ])
 
         if self.ld_sdk: