aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2023-09-05 15:46:36 +0300
committerthegeorg <thegeorg@yandex-team.com>2023-09-05 16:53:13 +0300
commit4493818feb0ec068c9838cdfe07e026a04dd3a2a (patch)
treebaae7a1eb079cc7d6fa657c29926c60a63e20b91
parent0ab82618948bf9a478770431b9eab1dbc38e98f6 (diff)
downloadydb-4493818feb0ec068c9838cdfe07e026a04dd3a2a.tar.gz
Restrict licenses on iOS by default
-rw-r--r--build/conf/license.conf4
-rw-r--r--build/ymake.core.conf9
2 files changed, 9 insertions, 4 deletions
diff --git a/build/conf/license.conf b/build/conf/license.conf
index 604309eb779..a5d61750755 100644
--- a/build/conf/license.conf
+++ b/build/conf/license.conf
@@ -449,7 +449,3 @@ macro LICENSE_RESTRICTION(TYPE, RESTRICTIONS...) {
SET_APPEND(MODULE_LICENSES_RESTRICTION_TYPES $TYPE)
SET_APPEND(MODULE_LICENSES_RESTRICTIONS $RESTRICTIONS)
}
-
-macro LICENSE_RESTRICTION_EXCEPTIONS(EXCEPT...) {
- SET_APPEND(MODULE_LICENSES_RESTRICTION_EXCEPTIONS $EXCEPT)
-}
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index fbd91961ac1..27963c6a7a9 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -987,6 +987,10 @@ module _LINK_UNIT: _BASE_UNIT {
MODULE_LICENSES_RESTRICTION_TYPES = DENY
MODULE_LICENSES_RESTRICTIONS = REQUIRE_DISCLOSURE FORBIDDEN NDA
}
+ when ($OS_IOS == "yes") {
+ MODULE_LICENSES_RESTRICTION_TYPES = DENY
+ MODULE_LICENSES_RESTRICTIONS = REQUIRE_DISCLOSURE FORBIDDEN NDA
+ }
ENABLE(COMMON_LINK_SETTINGS)
CHECK_PROVIDES()
}
@@ -1874,6 +1878,11 @@ module FAT_OBJECT: LIBRARY {
LDFLAGS_GLOBAL += -keep_private_externs
}
+ when ($OS_IOS == "yes") {
+ MODULE_LICENSES_RESTRICTION_TYPES = DENY
+ MODULE_LICENSES_RESTRICTIONS = REQUIRE_DISCLOSURE FORBIDDEN NDA
+ }
+
# FIXME: This is weird legacy
when ($OS_ANDROID == "yes") {
MODULE_PREFIX=lib