aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-02-09 20:52:08 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 15:58:17 +0300
commit1d6cd820856d7a70d8be542a226815b5c26d7285 (patch)
treec083effaea2f3d4b4d0612d90b48a0651f2937f6
parent1db1a68d1cac3536b6c8e72ccbb25a265292e4d6 (diff)
downloadydb-1d6cd820856d7a70d8be542a226815b5c26d7285.tar.gz
intermediate changes
ref:0ed7372a70d6b618fa5eea96758beac0150df5d3
-rw-r--r--build/scripts/gen_aar_gradle_script.py2
-rw-r--r--build/scripts/gen_test_apk_gradle_script.py2
-rw-r--r--contrib/tools/bison/bison/data/yacc.c6
-rw-r--r--contrib/tools/bison/bison/src/scan-skel.c5
4 files changed, 8 insertions, 7 deletions
diff --git a/build/scripts/gen_aar_gradle_script.py b/build/scripts/gen_aar_gradle_script.py
index bf99fc1251..4594e67278 100644
--- a/build/scripts/gen_aar_gradle_script.py
+++ b/build/scripts/gen_aar_gradle_script.py
@@ -49,7 +49,7 @@ ext.compileOnlyAndroidArs = [
{compile_only_aars}
]
-def minVersion = 18
+def minVersion = 21
def compileVersion = 30
def targetVersion = 30
def buildVersion = '30.0.3'
diff --git a/build/scripts/gen_test_apk_gradle_script.py b/build/scripts/gen_test_apk_gradle_script.py
index 16f59531a2..d1a78ceb1c 100644
--- a/build/scripts/gen_test_apk_gradle_script.py
+++ b/build/scripts/gen_test_apk_gradle_script.py
@@ -67,7 +67,7 @@ android {{
defaultConfig {{
- minSdkVersion 18
+ minSdkVersion 21
targetSdkVersion 30
applicationId "{app_id}"
}}
diff --git a/contrib/tools/bison/bison/data/yacc.c b/contrib/tools/bison/bison/data/yacc.c
index 8a7058e637..c18a9350cf 100644
--- a/contrib/tools/bison/bison/data/yacc.c
+++ b/contrib/tools/bison/bison/data/yacc.c
@@ -1055,9 +1055,9 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
null, do not copy; instead, return the length of what the result
would have been. */
#ifdef __cplusplus
-# define YY_FALLTHROUGH [[fallthrough]]
+# define BISON_FALLTHROUGH [[fallthrough]]
#else
-# define YY_FALLTHROUGH
+# define BISON_FALLTHROUGH
#endif
static YYSIZE_T
yytnamerr (char *yyres, const char *yystr)
@@ -1077,7 +1077,7 @@ yytnamerr (char *yyres, const char *yystr)
case '\\':
if (*++yyp != '\\')
goto do_not_strip_quotes;
- YY_FALLTHROUGH;
+ BISON_FALLTHROUGH;
default:
if (yyres)
yyres[yyn] = *yyp;
diff --git a/contrib/tools/bison/bison/src/scan-skel.c b/contrib/tools/bison/bison/src/scan-skel.c
index f16cdab3ef..1e116da14d 100644
--- a/contrib/tools/bison/bison/src/scan-skel.c
+++ b/contrib/tools/bison/bison/src/scan-skel.c
@@ -42,10 +42,11 @@
#endif
/* %if-c++-only */
+#define BISON_FALLTHROUGH [[fallthrough]]
/* %endif */
/* %if-c-only */
-
+#define BISON_FALLTHROUGH
/* %endif */
/* %if-c-only */
@@ -1618,7 +1619,7 @@ static int yy_get_next_buffer (void)
/* Reset buffer status. */
skel_restart(skel_in );
- /*FALLTHROUGH*/
+ BISON_FALLTHROUGH;
case EOB_ACT_END_OF_FILE:
{