From 7e835b273a0f458724e4b757e4b894b284e7cbc2 Mon Sep 17 00:00:00 2001 From: hlopko Date: Wed, 20 Feb 2019 00:25:00 -0800 Subject: [PATCH] Clear dynamic_library_linker_flag in legacy_fields_migrator RELNOTES: None. PiperOrigin-RevId: 234748020 --- tools/migration/legacy_fields_migration_lib.py | 1 + tools/migration/legacy_fields_migration_lib_test.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/migration/legacy_fields_migration_lib.py b/tools/migration/legacy_fields_migration_lib.py index 88853f7..d97a070 100644 --- a/tools/migration/legacy_fields_migration_lib.py +++ b/tools/migration/legacy_fields_migration_lib.py @@ -298,6 +298,7 @@ def migrate_legacy_fields(crosstool): toolchain.ClearField("compiler_flag") toolchain.ClearField("cxx_flag") toolchain.ClearField("linker_flag") + toolchain.ClearField("dynamic_library_linker_flag") toolchain.ClearField("static_runtimes_filegroup") toolchain.ClearField("dynamic_runtimes_filegroup") diff --git a/tools/migration/legacy_fields_migration_lib_test.py b/tools/migration/legacy_fields_migration_lib_test.py index a00554c..45d2017 100644 --- a/tools/migration/legacy_fields_migration_lib_test.py +++ b/tools/migration/legacy_fields_migration_lib_test.py @@ -318,7 +318,7 @@ class LegacyFieldsMigrationLibTest(unittest.TestCase): """) migrate_legacy_fields(crosstool) output = crosstool.toolchain[0] - self.assertEqual(len(output.linker_flag), 0) + self.assertEqual(len(output.dynamic_library_linker_flag), 0) self.assertEqual(output.feature[0].name, "default_link_flags") self.assertEqual(output.feature[0].flag_set[0].action, DYNAMIC_LIBRARY_LINK_ACTIONS)