aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2023-09-29 17:23:07 +0300
committerthegeorg <thegeorg@yandex-team.com>2023-09-29 18:29:11 +0300
commit7364fb3c4df0caaa51a82526fcc999b5fc2b7ab4 (patch)
treea815f33bbda0ce0d3b435bd895ba4cdf99302e6a
parentc4f321a89f4e56800b83c67a23ac876d6ae7119a (diff)
downloadydb-7364fb3c4df0caaa51a82526fcc999b5fc2b7ab4.tar.gz
Deduplicate license restriction triggers
-rw-r--r--build/ymake.core.conf9
1 files changed, 3 insertions, 6 deletions
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 58e8149762..b6ac4a2111 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -988,12 +988,10 @@ module _LINK_UNIT: _BASE_UNIT {
when ($OPENSOURCE == "yes" && $AUTOCHECK == "yes") {
# FIXME: Replace AUTOCHECK == yes with _not a host platform_ check after YMAKE-218
- MODULE_LICENSES_RESTRICTION_TYPES = DENY
- MODULE_LICENSES_RESTRICTIONS = REQUIRE_DISCLOSURE FORBIDDEN NDA
+ _ENABLE_BUILTIN_LICENSE_RESTRICTIONS = yes
}
when ($OS_IOS == "yes" || $OS_ANDROID == "yes" || $MAPSMOBI_BUILD_TARGET == "yes") {
- MODULE_LICENSES_RESTRICTION_TYPES = DENY
- MODULE_LICENSES_RESTRICTIONS = REQUIRE_DISCLOSURE FORBIDDEN NDA
+ _ENABLE_BUILTIN_LICENSE_RESTRICTIONS = yes
}
ENABLE(COMMON_LINK_SETTINGS)
CHECK_PROVIDES()
@@ -1883,8 +1881,7 @@ module FAT_OBJECT: LIBRARY {
}
when ($OS_IOS == "yes" || $OS_ANDROID == "yes" || $MAPSMOBI_BUILD_TARGET == "yes") {
- MODULE_LICENSES_RESTRICTION_TYPES = DENY
- MODULE_LICENSES_RESTRICTIONS = REQUIRE_DISCLOSURE FORBIDDEN NDA
+ _ENABLE_BUILTIN_LICENSE_RESTRICTIONS = yes
}
# FIXME: This is weird legacy