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

1 files changed, 194 insertions, 194 deletions

diff --git a/build/scripts/gen_aar_gradle_script.py b/build/scripts/gen_aar_gradle_script.py
index b95cc051c4..4594e67278 100644
--- a/build/scripts/gen_aar_gradle_script.py
+++ b/build/scripts/gen_aar_gradle_script.py
@@ -1,11 +1,11 @@
-import argparse 
-import os 
-import tarfile 
- 
-FLAT_DIRS_REPO_TEMPLATE='flatDir {{ dirs {dirs} }}\n' 
-MAVEN_REPO_TEMPLATE='maven {{ url "{repo}" }}\n' 
-KEYSTORE_TEMLATE='signingConfigs {{ debug {{ storeFile file("{keystore}") }} }}\n' 
- 
+import argparse
+import os
+import tarfile
+
+FLAT_DIRS_REPO_TEMPLATE='flatDir {{ dirs {dirs} }}\n'
+MAVEN_REPO_TEMPLATE='maven {{ url "{repo}" }}\n'
+KEYSTORE_TEMLATE='signingConfigs {{ debug {{ storeFile file("{keystore}") }} }}\n'
+
 ENABLE_JAVADOC = 'tasks["bundle${suffix}Aar"].dependsOn packageJavadocTask'
 DO_NOT_STRIP = '''\
     packagingOptions {
@@ -16,35 +16,35 @@ DO_NOT_STRIP = '''\
     }
 '''
 
-AAR_TEMPLATE = """\ 
-ext.jniLibsDirs = [ 
-    {jni_libs_dirs} 
-] 
- 
-ext.resDirs = [ 
-    {res_dirs} 
-] 
- 
-ext.assetsDirs = [ 
-    {assets_dirs} 
-] 
- 
-ext.javaDirs = [ 
-    {java_dirs} 
-] 
- 
-def aidlDirs = [ 
-    {aidl_dirs} 
-] 
- 
-ext.bundles = [ 
-    {bundles} 
-] 
- 
-ext.androidArs = [ 
-    {aars} 
-] 
- 
+AAR_TEMPLATE = """\
+ext.jniLibsDirs = [
+    {jni_libs_dirs}
+]
+
+ext.resDirs = [
+    {res_dirs}
+]
+
+ext.assetsDirs = [
+    {assets_dirs}
+]
+
+ext.javaDirs = [
+    {java_dirs}
+]
+
+def aidlDirs = [
+    {aidl_dirs}
+]
+
+ext.bundles = [
+    {bundles}
+]
+
+ext.androidArs = [
+    {aars}
+]
+
 ext.compileOnlyAndroidArs = [
     {compile_only_aars}
 ]
@@ -53,96 +53,96 @@ def minVersion = 21
 def compileVersion = 30
 def targetVersion = 30
 def buildVersion = '30.0.3'
- 
-import com.android.build.gradle.LibraryPlugin 
+
+import com.android.build.gradle.LibraryPlugin
 import java.nio.file.Files
 import java.nio.file.Paths
-import java.util.regex.Matcher 
-import java.util.regex.Pattern 
+import java.util.regex.Matcher
+import java.util.regex.Pattern
 import java.util.zip.ZipFile
- 
-
-apply plugin: 'com.github.dcendents.android-maven' 
- 
-buildDir = "$projectDir/build" 
- 
-if (!ext.has("packageSuffix")) 
-    ext.packageSuffix = "" 
- 
-buildscript {{ 
-//     repositories {{ 
-//         jcenter() 
-//         mavenCentral() 
-//     }} 
- 
-    repositories {{ 
-        {maven_repos} 
-    }} 
- 
-    dependencies {{ 
+
+
+apply plugin: 'com.github.dcendents.android-maven'
+
+buildDir = "$projectDir/build"
+
+if (!ext.has("packageSuffix"))
+    ext.packageSuffix = ""
+
+buildscript {{
+//     repositories {{
+//         jcenter()
+//         mavenCentral()
+//     }}
+
+    repositories {{
+        {maven_repos}
+    }}
+
+    dependencies {{
         classpath 'com.android.tools.build:gradle:4.0.2'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' 
-    }} 
-}} 
- 
-apply plugin: LibraryPlugin 
- 
-repositories {{ 
-//     flatDir {{ 
-//         dirs System.env.PKG_ROOT + '/bundle' 
-//     }} 
-//     maven {{ 
-//         url "http://maven.google.com/" 
-//     }} 
-//     maven {{ 
-//         url "http://artifactory.yandex.net/artifactory/public/" 
-//     }} 
- 
-    {flat_dirs_repo} 
- 
-    {maven_repos} 
-}} 
- 
-android {{ 
-    {keystore} 
- 
-    compileSdkVersion compileVersion 
-    buildToolsVersion buildVersion 
- 
-    defaultConfig {{ 
-        minSdkVersion minVersion 
-        targetSdkVersion targetVersion 
-        consumerProguardFiles '{proguard_rules}' 
-    }} 
- 
-    sourceSets {{ 
-        main  {{ 
-            manifest.srcFile '{manifest}' 
-            jniLibs.srcDirs = jniLibsDirs 
-            res.srcDirs = resDirs 
-            assets.srcDirs = assetsDirs 
-            java.srcDirs = javaDirs 
-            aidl.srcDirs = aidlDirs 
-        }} 
-        // We don't use this feature, so we set it to nonexisting directory 
-        androidTest.setRoot('bundle/tests') 
-    }} 
- 
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+    }}
+}}
+
+apply plugin: LibraryPlugin
+
+repositories {{
+//     flatDir {{
+//         dirs System.env.PKG_ROOT + '/bundle'
+//     }}
+//     maven {{
+//         url "http://maven.google.com/"
+//     }}
+//     maven {{
+//         url "http://artifactory.yandex.net/artifactory/public/"
+//     }}
+
+    {flat_dirs_repo}
+
+    {maven_repos}
+}}
+
+android {{
+    {keystore}
+
+    compileSdkVersion compileVersion
+    buildToolsVersion buildVersion
+
+    defaultConfig {{
+        minSdkVersion minVersion
+        targetSdkVersion targetVersion
+        consumerProguardFiles '{proguard_rules}'
+    }}
+
+    sourceSets {{
+        main  {{
+            manifest.srcFile '{manifest}'
+            jniLibs.srcDirs = jniLibsDirs
+            res.srcDirs = resDirs
+            assets.srcDirs = assetsDirs
+            java.srcDirs = javaDirs
+            aidl.srcDirs = aidlDirs
+        }}
+        // We don't use this feature, so we set it to nonexisting directory
+        androidTest.setRoot('bundle/tests')
+    }}
+
     {do_not_strip}
 
-    dependencies {{ 
-        for (bundle in bundles) 
+    dependencies {{
+        for (bundle in bundles)
             compile("$bundle") {{
-                transitive = true 
-            }} 
-        for (bundle in androidArs) 
+                transitive = true
+            }}
+        for (bundle in androidArs)
             compile(bundle) {{
-                transitive = true 
-            }} 
+                transitive = true
+            }}
         for (bundle in compileOnlyAndroidArs)
             compileOnly(bundle)
-    }} 
- 
+    }}
+
     android.libraryVariants.all {{ variant ->
         def suffix = variant.buildType.name.capitalize()
 
@@ -157,17 +157,17 @@ android {{
                 }}
             }}
             includeEmptyDirs = false
-        }} 
- 
+        }}
+
         def manifestFile = android.sourceSets.main.manifest.srcFile
         def manifestXml = new XmlParser().parse(manifestFile)
- 
+
         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 {{
@@ -177,10 +177,10 @@ android {{
                 }}
             }}.writeTo("$buildDir/${{rootProject.name}}$packageSuffix-pom.xml")
         }}
- 
+
         tasks["bundle${{suffix}}Aar"].dependsOn sourcesJarTask
         tasks["bundle${{suffix}}Aar"].dependsOn writePomTask
-    }} 
+    }}
 
     android.libraryVariants.all {{ variant ->
         def capitalizedVariantName = variant.name.capitalize()
@@ -245,7 +245,7 @@ android {{
         {enable_javadoc}
     }}
 
-}} 
+}}
 
 private def extractClassesJar(aarPath, outputPath) {{
     if (!aarPath.exists()) {{
@@ -265,36 +265,36 @@ private def extractClassesJar(aarPath, outputPath) {{
     zip.close()
 }}
 
-""" 
- 
- 
-def gen_build_script(args): 
- 
-    def wrap(items): 
-        return ',\n    '.join('"{}"'.format(x) for x in items) 
- 
-    bundles = [] 
-    bundles_dirs = set(args.flat_repos) 
-    for bundle in args.bundles: 
-        dir_name, base_name = os.path.split(bundle) 
-        assert(len(dir_name) > 0 and len(base_name) > 0) 
-        name, ext = os.path.splitext(base_name) 
-        assert(len(name) > 0 and ext == '.aar') 
-        bundles_dirs.add(dir_name) 
-        bundles.append('com.yandex:{}@aar'.format(name)) 
- 
-    if len(bundles_dirs) > 0: 
-        flat_dirs_repo = FLAT_DIRS_REPO_TEMPLATE.format(dirs=wrap(bundles_dirs)) 
-    else: 
-        flat_dirs_repo = '' 
- 
-    maven_repos = ''.join(MAVEN_REPO_TEMPLATE.format(repo=repo) for repo in args.maven_repos) 
- 
-    if args.keystore: 
-        keystore = KEYSTORE_TEMLATE.format(keystore=args.keystore) 
-    else: 
-        keystore = '' 
- 
+"""
+
+
+def gen_build_script(args):
+
+    def wrap(items):
+        return ',\n    '.join('"{}"'.format(x) for x in items)
+
+    bundles = []
+    bundles_dirs = set(args.flat_repos)
+    for bundle in args.bundles:
+        dir_name, base_name = os.path.split(bundle)
+        assert(len(dir_name) > 0 and len(base_name) > 0)
+        name, ext = os.path.splitext(base_name)
+        assert(len(name) > 0 and ext == '.aar')
+        bundles_dirs.add(dir_name)
+        bundles.append('com.yandex:{}@aar'.format(name))
+
+    if len(bundles_dirs) > 0:
+        flat_dirs_repo = FLAT_DIRS_REPO_TEMPLATE.format(dirs=wrap(bundles_dirs))
+    else:
+        flat_dirs_repo = ''
+
+    maven_repos = ''.join(MAVEN_REPO_TEMPLATE.format(repo=repo) for repo in args.maven_repos)
+
+    if args.keystore:
+        keystore = KEYSTORE_TEMLATE.format(keystore=args.keystore)
+    else:
+        keystore = ''
+
     if args.generate_doc:
         enable_javadoc = ENABLE_JAVADOC
     else:
@@ -305,7 +305,7 @@ def gen_build_script(args):
     else:
         do_not_strip = ''
 
-    return AAR_TEMPLATE.format( 
+    return AAR_TEMPLATE.format(
         aars=wrap(args.aars),
         compile_only_aars=wrap(args.compile_only_aars),
         aidl_dirs=wrap(args.aidl_dirs),
@@ -321,54 +321,54 @@ def gen_build_script(args):
         maven_repos=maven_repos,
         proguard_rules=args.proguard_rules,
         res_dirs=wrap(args.res_dirs),
-    ) 
- 
- 
-if __name__ == '__main__': 
-    parser = argparse.ArgumentParser() 
+    )
+
+
+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('--assets-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=[]) 
+    parser.add_argument('--bundles', nargs='*', default=[])
     parser.add_argument('--do-not-strip', action='store_true')
     parser.add_argument('--flat-repos', nargs='*', default=[])
     parser.add_argument('--generate-doc', action='store_true')
-    parser.add_argument('--java-dirs', nargs='*', default=[]) 
-    parser.add_argument('--jni-libs-dirs', nargs='*', default=[]) 
+    parser.add_argument('--java-dirs', nargs='*', default=[])
+    parser.add_argument('--jni-libs-dirs', nargs='*', default=[])
     parser.add_argument('--keystore', default=None)
-    parser.add_argument('--manifest', required=True) 
-    parser.add_argument('--maven-repos', nargs='*', default=[]) 
-    parser.add_argument('--output-dir', required=True) 
+    parser.add_argument('--manifest', required=True)
+    parser.add_argument('--maven-repos', nargs='*', default=[])
+    parser.add_argument('--output-dir', required=True)
     parser.add_argument('--peers', nargs='*', default=[])
-    parser.add_argument('--proguard-rules', nargs='?', default=None) 
-    parser.add_argument('--res-dirs', nargs='*', default=[]) 
-    args = parser.parse_args() 
- 
-    if args.proguard_rules is None: 
-        args.proguard_rules = os.path.join(args.output_dir, 'proguard-rules.txt') 
-        with open(args.proguard_rules, 'w') as f: 
-            pass 
- 
-    for index, jsrc in enumerate(filter(lambda x: x.endswith('.jsrc'), args.peers)): 
-        jsrc_dir = os.path.join(args.output_dir, 'jsrc_{}'.format(str(index))) 
-        os.makedirs(jsrc_dir) 
-        with tarfile.open(jsrc, 'r') as tar: 
-            tar.extractall(path=jsrc_dir) 
-            args.java_dirs.append(jsrc_dir) 
- 
-    args.build_gradle = os.path.join(args.output_dir, 'build.gradle') 
-    args.settings_gradle = os.path.join(args.output_dir, 'settings.gradle') 
+    parser.add_argument('--proguard-rules', nargs='?', default=None)
+    parser.add_argument('--res-dirs', nargs='*', default=[])
+    args = parser.parse_args()
+
+    if args.proguard_rules is None:
+        args.proguard_rules = os.path.join(args.output_dir, 'proguard-rules.txt')
+        with open(args.proguard_rules, 'w') as f:
+            pass
+
+    for index, jsrc in enumerate(filter(lambda x: x.endswith('.jsrc'), args.peers)):
+        jsrc_dir = os.path.join(args.output_dir, 'jsrc_{}'.format(str(index)))
+        os.makedirs(jsrc_dir)
+        with tarfile.open(jsrc, 'r') as tar:
+            tar.extractall(path=jsrc_dir)
+            args.java_dirs.append(jsrc_dir)
+
+    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')
- 
-    content = gen_build_script(args) 
-    with open(args.build_gradle, 'w') as f: 
-        f.write(content) 
- 
+
+    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')
 
-    if args.bundle_name: 
-        with open(args.settings_gradle, 'w') as f: 
-            f.write('rootProject.name = "{}"'.format(args.bundle_name)) 
+    if args.bundle_name:
+        with open(args.settings_gradle, 'w') as f:
+            f.write('rootProject.name = "{}"'.format(args.bundle_name))