diff options
author | trivias <trivias@yandex-team.ru> | 2022-02-10 16:46:12 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:46:12 +0300 |
commit | 9bf2fa2b060c9881d3135c2208c624a1dd546ecc (patch) | |
tree | 1a2c5ffcf89eb53ecd79dbc9bc0a195c27404d0c /build | |
parent | 11ab7328455192b9cdb4bbb79f8615bf356182ca (diff) | |
download | ydb-9bf2fa2b060c9881d3135c2208c624a1dd546ecc.tar.gz |
Restoring authorship annotation for <trivias@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'build')
-rw-r--r-- | build/conf/project_specific/maps/mapkit.conf | 2 | ||||
-rw-r--r-- | build/external_resources/mapsmobi_ios_pods/ya.make | 22 | ||||
-rw-r--r-- | build/platform/macos_sdk/ya.make | 8 | ||||
-rw-r--r-- | build/platform/mapkit/ya.make | 6 | ||||
-rw-r--r-- | build/platform/opengl/ya.make | 52 | ||||
-rw-r--r-- | build/rules/contrib_restricted.policy | 2 | ||||
-rw-r--r-- | build/scripts/gen_aar_gradle_script.py | 16 | ||||
-rw-r--r-- | build/ymake.core.conf | 2 |
8 files changed, 55 insertions, 55 deletions
diff --git a/build/conf/project_specific/maps/mapkit.conf b/build/conf/project_specific/maps/mapkit.conf index d0ffea8033..d64b41f72a 100644 --- a/build/conf/project_specific/maps/mapkit.conf +++ b/build/conf/project_specific/maps/mapkit.conf @@ -163,7 +163,7 @@ macro MAPS_GARDEN_COLLECT_MODULE_TRAITS(VAR, DIR) { # mapsmobi build configuration -MAPSMOBI_FAKEID=${FAKEID}_r8609790 +MAPSMOBI_FAKEID=${FAKEID}_r8609790 MAPSMOBI_BUILD= YANDEX_EXPORT= YRT_EXPORT= diff --git a/build/external_resources/mapsmobi_ios_pods/ya.make b/build/external_resources/mapsmobi_ios_pods/ya.make index d0739067fa..a733c6beb4 100644 --- a/build/external_resources/mapsmobi_ios_pods/ya.make +++ b/build/external_resources/mapsmobi_ios_pods/ya.make @@ -1,12 +1,12 @@ -RESOURCES_LIBRARY() - -OWNER(g:mapkit) - -IF (OS_IOS) +RESOURCES_LIBRARY() + +OWNER(g:mapkit) + +IF (OS_IOS) 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) -ENDIF() - -END() + CFLAGS(GLOBAL "-I$MAPSMOBI_IOS_PODS_RESOURCE_GLOBAL/Pods/Headers/Public") +ELSE() + MESSAGE(FATAL_ERROR Unsupported platform) +ENDIF() + +END() diff --git a/build/platform/macos_sdk/ya.make b/build/platform/macos_sdk/ya.make index b2e20f20c8..6fb8dc54c0 100644 --- a/build/platform/macos_sdk/ya.make +++ b/build/platform/macos_sdk/ya.make @@ -10,11 +10,11 @@ IF (USE_STL_SYSTEM) SET(__XCODE_TOOLCHAIN_VERSION ${CPP_XCODE_TOOLCHAIN_VERSION}) INCLUDE(${ARCADIA_ROOT}/build/platform/xcode/ya.make.inc) CFLAGS( - GLOBAL -F$MACOS_SDK_RESOURCE_GLOBAL/System/Library/Frameworks + GLOBAL -F$MACOS_SDK_RESOURCE_GLOBAL/System/Library/Frameworks + ) + LDFLAGS( + -F$MACOS_SDK_RESOURCE_GLOBAL/System/Library/Frameworks ) - LDFLAGS( - -F$MACOS_SDK_RESOURCE_GLOBAL/System/Library/Frameworks - ) ENDIF() END() diff --git a/build/platform/mapkit/ya.make b/build/platform/mapkit/ya.make index 36c6947482..513dff5bcf 100644 --- a/build/platform/mapkit/ya.make +++ b/build/platform/mapkit/ya.make @@ -5,12 +5,12 @@ OWNER(somov) NO_PLATFORM() IF (OS_ANDROID) - IF (MAPS_MOBILE_EXPORT_CPP_API) + 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) - CFLAGS(GLOBAL -nostdinc++ GLOBAL -cxx-isystem GLOBAL $MAPKIT_ANDROID_LIBCXX_HEADERS_RESOURCE_GLOBAL) - ENDIF() + CFLAGS(GLOBAL -nostdinc++ GLOBAL -cxx-isystem GLOBAL $MAPKIT_ANDROID_LIBCXX_HEADERS_RESOURCE_GLOBAL) + ENDIF() DECLARE_EXTERNAL_RESOURCE(MAPKIT_ANDROID_LIBCXX_LIBRARIES sbr:2527853263) diff --git a/build/platform/opengl/ya.make b/build/platform/opengl/ya.make index 2c88b9d7a9..94f0431d18 100644 --- a/build/platform/opengl/ya.make +++ b/build/platform/opengl/ya.make @@ -1,27 +1,27 @@ -RESOURCES_LIBRARY() - -OWNER(g:contrib heretic) - -IF (NOT OPENGL_REQUIRED) - MESSAGE(FATAL_ERROR "No OpenGL Toolkit for your build") -ELSE() - IF (OS_LINUX) +RESOURCES_LIBRARY() + +OWNER(g:contrib heretic) + +IF (NOT OPENGL_REQUIRED) + MESSAGE(FATAL_ERROR "No OpenGL Toolkit for your build") +ELSE() + IF (OS_LINUX) IF (OPENGL_VERSION == "18.0.5") - DECLARE_EXTERNAL_RESOURCE(OPENGL sbr:1271121094) - SET(OS_SUFFIX "x86_64-linux-gnu") - ELSE() - ENABLE(OPENGL_NOT_FOUND) - ENDIF() - ELSE() - ENABLE(OPENGL_NOT_FOUND) - ENDIF() - - IF (OPENGL_NOT_FOUND) - MESSAGE(FATAL_ERROR "No OpenGL Toolkit for the selected platform") - ELSE() - CFLAGS(GLOBAL "-I$OPENGL_RESOURCE_GLOBAL/usr/include") - LDFLAGS("-L$OPENGL_RESOURCE_GLOBAL/usr/lib/$OS_SUFFIX") - ENDIF() -ENDIF() - -END() + DECLARE_EXTERNAL_RESOURCE(OPENGL sbr:1271121094) + SET(OS_SUFFIX "x86_64-linux-gnu") + ELSE() + ENABLE(OPENGL_NOT_FOUND) + ENDIF() + ELSE() + ENABLE(OPENGL_NOT_FOUND) + ENDIF() + + IF (OPENGL_NOT_FOUND) + MESSAGE(FATAL_ERROR "No OpenGL Toolkit for the selected platform") + ELSE() + CFLAGS(GLOBAL "-I$OPENGL_RESOURCE_GLOBAL/usr/include") + LDFLAGS("-L$OPENGL_RESOURCE_GLOBAL/usr/lib/$OS_SUFFIX") + ENDIF() +ENDIF() + +END() diff --git a/build/rules/contrib_restricted.policy b/build/rules/contrib_restricted.policy index 52fe330179..a83ead1904 100644 --- a/build/rules/contrib_restricted.policy +++ b/build/rules/contrib_restricted.policy @@ -170,7 +170,7 @@ ALLOW library/python/testing/gtest/test/gtest -> contrib/restricted/googletest # TODO remove this lines after they will switch to library/cpp/testing/gtest ALLOW mail -> contrib/restricted/googletest ALLOW maps/mobile/libs -> contrib/restricted/googletest -ALLOW maps/mobile/bundle -> contrib/restricted/googletest +ALLOW maps/mobile/bundle -> contrib/restricted/googletest ALLOW mds -> contrib/restricted/googletest # A mere proxy to allow using gmock in libraries without being bound to specific test framework # See IGNIETFERRO-1827 for details. diff --git a/build/scripts/gen_aar_gradle_script.py b/build/scripts/gen_aar_gradle_script.py index f05cc84fa9..4594e67278 100644 --- a/build/scripts/gen_aar_gradle_script.py +++ b/build/scripts/gen_aar_gradle_script.py @@ -45,10 +45,10 @@ ext.androidArs = [ {aars} ] -ext.compileOnlyAndroidArs = [ - {compile_only_aars} -] - +ext.compileOnlyAndroidArs = [ + {compile_only_aars} +] + def minVersion = 21 def compileVersion = 30 def targetVersion = 30 @@ -139,8 +139,8 @@ android {{ compile(bundle) {{ transitive = true }} - for (bundle in compileOnlyAndroidArs) - compileOnly(bundle) + for (bundle in compileOnlyAndroidArs) + compileOnly(bundle) }} android.libraryVariants.all {{ variant -> @@ -307,7 +307,7 @@ def gen_build_script(args): return AAR_TEMPLATE.format( aars=wrap(args.aars), - compile_only_aars=wrap(args.compile_only_aars), + compile_only_aars=wrap(args.compile_only_aars), aidl_dirs=wrap(args.aidl_dirs), assets_dirs=wrap(args.assets_dirs), bundles=wrap(bundles), @@ -327,7 +327,7 @@ def gen_build_script(args): if __name__ == '__main__': parser = argparse.ArgumentParser() parser.add_argument('--aars', nargs='*', default=[]) - parser.add_argument('--compile-only-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('--bundle-name', nargs='?', default='default-bundle-name') diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 251ec79977..081833998b 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -8961,7 +8961,7 @@ otherwise { # tag:frontend-specific ### @usage: COLLECT_FRONTEND_FILES(Varname, Dir) -### +### ### Recursively collect files with typical frontend extensions from Dir and save the result into variable Varname macro COLLECT_FRONTEND_FILES(Varname, Dir) { _GLOB($Varname $Dir/**/*.(css|ejs|jpg|js|jsx|png|styl|svg|ts|tsx|json|html)) |