diff options
| author | axxeny <axxeny@yandex-team.ru> | 2022-02-10 16:51:37 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:51:37 +0300 |
| commit | 597c5894e3c8cdfa680c5a5e8c2e69b61dce8254 (patch) | |
| tree | 5d5cb817648f650d76cf1076100726fd9b8448e8 | |
| parent | f98b1ccc0a85cf58ec2b65a39dd7feb770803bba (diff) | |
| download | ydb-597c5894e3c8cdfa680c5a5e8c2e69b61dce8254.tar.gz | |
Restoring authorship annotation for <axxeny@yandex-team.ru>. Commit 2 of 2.
| -rw-r--r-- | build/platform/mapkit/ya.make | 4 | ||||
| -rw-r--r-- | build/scripts/gen_aar_gradle_script.py | 20 | ||||
| -rwxr-xr-x | build/ymake_conf.py | 6 |
3 files changed, 15 insertions, 15 deletions
diff --git a/build/platform/mapkit/ya.make b/build/platform/mapkit/ya.make index 2679282ba4..513dff5bcf 100644 --- a/build/platform/mapkit/ya.make +++ b/build/platform/mapkit/ya.make @@ -6,8 +6,8 @@ NO_PLATFORM() IF (OS_ANDROID) IF (MAPS_MOBILE_EXPORT_CPP_API) - # Sandbox Resource ID duplicates - # arcadia/sandbox/projects/maps/mobile/MapsMobileMakeArtifacts/__init__.py + # Sandbox Resource ID duplicates + # arcadia/sandbox/projects/maps/mobile/MapsMobileMakeArtifacts/__init__.py DECLARE_EXTERNAL_RESOURCE(MAPKIT_ANDROID_LIBCXX_HEADERS sbr:2527848662) CFLAGS(GLOBAL -nostdinc++ GLOBAL -cxx-isystem GLOBAL $MAPKIT_ANDROID_LIBCXX_HEADERS_RESOURCE_GLOBAL) ENDIF() diff --git a/build/scripts/gen_aar_gradle_script.py b/build/scripts/gen_aar_gradle_script.py index 3240cc34c5..4594e67278 100644 --- a/build/scripts/gen_aar_gradle_script.py +++ b/build/scripts/gen_aar_gradle_script.py @@ -132,11 +132,11 @@ android {{ dependencies {{ for (bundle in bundles) - compile("$bundle") {{ + compile("$bundle") {{ transitive = true }} for (bundle in androidArs) - compile(bundle) {{ + compile(bundle) {{ transitive = true }} for (bundle in compileOnlyAndroidArs) @@ -150,20 +150,20 @@ android {{ classifier = 'sources' from android.sourceSets.main.java.srcDirs include '**/*.java' - eachFile {{ fcd -> - def segments = fcd.relativePath.segments - if (segments[0] == 'impl') {{ - fcd.relativePath = new RelativePath(true, segments.drop(1)) - }} - }} - includeEmptyDirs = false + eachFile {{ fcd -> + def segments = fcd.relativePath.segments + if (segments[0] == 'impl') {{ + fcd.relativePath = new RelativePath(true, segments.drop(1)) + }} + }} + 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 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] diff --git a/build/ymake_conf.py b/build/ymake_conf.py index d3c3b36fa3..30219eb85e 100755 --- a/build/ymake_conf.py +++ b/build/ymake_conf.py @@ -1921,9 +1921,9 @@ class LD(Linker): if not preset('NO_DEBUGINFO'): self.dwarf_command = '$DWARF_TOOL $TARGET -o ${output;pre=$MODULE_PREFIX$REALPRJNAME.dSYM/Contents/Resources/DWARF/$MODULE_PREFIX:REALPRJNAME}' - if self.target.is_ios and preset('MAPSMOBI_BUILD_TARGET') and self.target.is_arm: - self.ld_flags.extend(('-fembed-bitcode', '-Wl,-bitcode_verify')) - + if self.target.is_ios and preset('MAPSMOBI_BUILD_TARGET') and self.target.is_arm: + self.ld_flags.extend(('-fembed-bitcode', '-Wl,-bitcode_verify')) + if self.build.profiler_type == Profiler.GProf: self.ld_flags.append('-pg') |