diff options
| author | dvorkanton <dvorkanton@yandex-team.ru> | 2022-02-10 16:46:04 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:46:04 +0300 |
| commit | 110a978b66fe6c0916572df51cfead2a9b647174 (patch) | |
| tree | 1a2c5ffcf89eb53ecd79dbc9bc0a195c27404d0c /build | |
| parent | ce1ca0f8ad5b8231d32b35629f85bb09beea1bfb (diff) | |
| download | ydb-110a978b66fe6c0916572df51cfead2a9b647174.tar.gz | |
Restoring authorship annotation for <dvorkanton@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'build')
| -rw-r--r-- | build/sysincl/android.yml | 4 | ||||
| -rw-r--r-- | build/ymake.core.conf | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/build/sysincl/android.yml b/build/sysincl/android.yml index ebae17367b..97cfbf38d2 100644 --- a/build/sysincl/android.yml +++ b/build/sysincl/android.yml @@ -1,7 +1,7 @@ - includes: - android/asset_manager.h - android/asset_manager_jni.h - - android/dlext.h + - android/dlext.h - android/log.h - android/native_window_jni.h - cpu-features.h: contrib/libs/android_cpufeatures/cpu-features.h @@ -19,7 +19,7 @@ - SLES/OpenSLES_AndroidConfiguration.h - SLES/OpenSLES_AndroidMetadata.h - SLES/OpenSLES_Platform.h - - linux/ashmem.h + - linux/ashmem.h - source_filter: "^contrib/libs/breakpad/src" includes: diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 70df0cc881..081833998b 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -907,26 +907,26 @@ macro _PY_PROTO_CMD_INTERNAL(File) { } # tag:proto tag:java-specific -JAVA_PROTO_RUNTIME= +JAVA_PROTO_RUNTIME= # tag:proto tag:java-specific -### @usage: USE_JAVALITE() -### Use protobuf-javalite for Java +### @usage: USE_JAVALITE() +### Use protobuf-javalite for Java macro USE_JAVALITE() { - SET(JAVA_PROTO_RUNTIME javalite) + SET(JAVA_PROTO_RUNTIME javalite) } # tag:proto tag:java-specific JAVA_PROTO_RUNTIME_VERSION = 3.18.2 JAVA_PROTO_COMMON_VERSION = 1.12.0 -when ($JAVA_PROTO_RUNTIME == "javalite") { - _JAVA_PROTO_OUT_ARG=--java_out=lite: +when ($JAVA_PROTO_RUNTIME == "javalite") { + _JAVA_PROTO_OUT_ARG=--java_out=lite: JAVA_PROTOBUF_PEERS=contrib/java/com/google/protobuf/protobuf-javalite/${JAVA_PROTO_RUNTIME_VERSION} - JAVA_GRPC_STUB=contrib/java/io/grpc/grpc-stub/1.19.0 - JAVA_GRPC_PROTOBUF=contrib/java/io/grpc/grpc-protobuf/1.19.0 -} + JAVA_GRPC_STUB=contrib/java/io/grpc/grpc-stub/1.19.0 + JAVA_GRPC_PROTOBUF=contrib/java/io/grpc/grpc-protobuf/1.19.0 +} otherwise { - _JAVA_PROTO_OUT_ARG=--java_out= + _JAVA_PROTO_OUT_ARG=--java_out= JAVA_PROTOBUF_PEERS=contrib/java/com/google/protobuf/protobuf-java/${JAVA_PROTO_RUNTIME_VERSION} JAVA_GRPC_STUB=contrib/java/io/grpc/grpc-stub/1.26.0 JAVA_GRPC_PROTOBUF=contrib/java/io/grpc/grpc-protobuf/1.26.0 |