diff --git a/templates/cxx/cxx.gni b/templates/cxx/cxx.gni index d523cd25be7f6e74ef31b8c92a73fbc8c4164080..d3c5baeb93270cfd4c9660dc326c1e5e41c5ca78 100644 --- a/templates/cxx/cxx.gni +++ b/templates/cxx/cxx.gni @@ -35,11 +35,6 @@ debug_level_configs = [ "//build/config/compiler:no_optimize", ] -valid_lib_dirs_list = [ - "*llvm*", - "*clang*" -] - template("ohos_executable") { assert(!defined(invoker.output_dir), "output_dir is not allowed to be defined.") @@ -442,14 +437,6 @@ template("ohos_executable") { deps += [ ":${_collect_target}" ] - if (defined(lib_dirs)) { - not_allow_lib_dirs = filter_exclude(lib_dirs, valid_lib_dirs_list) - if (defined(lib_dirs_whitelist)) { - not_allow_lib_dirs = filter_exclude(not_allow_lib_dirs, lib_dirs_whitelist) - } - assert(not_allow_lib_dirs == [], - "${target_name} has invalid lib_dirs value: $not_allow_lib_dirs") - } if (!defined(libs)) { libs = [] } @@ -1256,14 +1243,6 @@ template("ohos_shared_library") { ] } - if (defined(lib_dirs)) { - not_allow_lib_dirs = filter_exclude(lib_dirs, valid_lib_dirs_list) - if (defined(lib_dirs_whitelist)) { - not_allow_lib_dirs = filter_exclude(not_allow_lib_dirs, lib_dirs_whitelist) - } - assert(not_allow_lib_dirs == [], - "${target_name} has invalid lib_dirs value: $not_allow_lib_dirs") - } if (!defined(libs)) { libs = [] } @@ -1698,14 +1677,6 @@ template("ohos_static_library") { deps += [ ":$_notice_target" ] } - if (defined(lib_dirs)) { - not_allow_lib_dirs = filter_exclude(lib_dirs, valid_lib_dirs_list) - if (defined(lib_dirs_whitelist)) { - not_allow_lib_dirs = filter_exclude(not_allow_lib_dirs, lib_dirs_whitelist) - } - assert(not_allow_lib_dirs == [], - "${target_name} has invalid lib_dirs value: $not_allow_lib_dirs") - } if (!defined(libs)) { libs = [] } @@ -2027,14 +1998,6 @@ template("ohos_source_set") { deps += [ ":$_notice_target" ] } - if (defined(lib_dirs)) { - not_allow_lib_dirs = filter_exclude(lib_dirs, valid_lib_dirs_list) - if (defined(lib_dirs_whitelist)) { - not_allow_lib_dirs = filter_exclude(not_allow_lib_dirs, lib_dirs_whitelist) - } - assert(not_allow_lib_dirs == [], - "${target_name} has invalid lib_dirs value: $not_allow_lib_dirs") - } if (!defined(libs)) { libs = [] }