From 1bf58436a8fca8c704c8738520cc6d33d4f73da0 Mon Sep 17 00:00:00 2001 From: waltl Date: Fri, 30 Apr 2021 05:50:04 -0700 Subject: [PATCH 1/2] Delete generate dsym info in ObjcConfiguration This is redundate with info in CppConfiguration. RELNOTES[INC]: The Starlark method generate_dsym in objc fragment has been deleted. Please use the equivalent apple_generate_dsym in cpp fragment instead. PiperOrigin-RevId: 371316983 --- .../build/lib/rules/objc/ObjcConfiguration.java | 13 ------------- .../apple/ObjcConfigurationApi.java | 6 ------ .../build/lib/rules/objc/ObjcStarlarkTest.java | 7 +------ 3 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java index de7a3eb3312862..fc15a89335c90a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java @@ -53,7 +53,6 @@ public class ObjcConfiguration extends Fragment implements ObjcConfigurationApi< private final String watchosSimulatorDevice; private final DottedVersion tvosSimulatorVersion; private final String tvosSimulatorDevice; - private final boolean generateDsym; private final boolean generateLinkmap; private final boolean runMemleaks; private final ImmutableList copts; @@ -69,7 +68,6 @@ public class ObjcConfiguration extends Fragment implements ObjcConfigurationApi< public ObjcConfiguration(BuildOptions buildOptions) { CoreOptions options = buildOptions.get(CoreOptions.class); - CppOptions cppOptions = buildOptions.get(CppOptions.class); ObjcCommandLineOptions objcOptions = buildOptions.get(ObjcCommandLineOptions.class); this.iosSimulatorDevice = objcOptions.iosSimulatorDevice; @@ -82,9 +80,6 @@ public ObjcConfiguration(BuildOptions buildOptions) { this.runMemleaks = objcOptions.runMemleaks; this.copts = ImmutableList.copyOf(objcOptions.copts); this.compilationMode = Preconditions.checkNotNull(options.compilationMode, "compilationMode"); - this.generateDsym = - cppOptions.appleGenerateDsym - || (cppOptions.appleEnableAutoDsymDbg && this.compilationMode == CompilationMode.DBG); this.fastbuildOptions = ImmutableList.copyOf(objcOptions.fastbuildOptions); this.enableBinaryStripping = objcOptions.enableBinaryStripping; this.signingCertName = objcOptions.iosSigningCertName; @@ -141,14 +136,6 @@ public DottedVersion getSimulatorVersionForPlatformType(PlatformType platformTyp } } - /** - * Returns whether dSYM generation is enabled. - */ - @Override - public boolean generateDsym() { - return generateDsym; - } - /** * Returns whether linkmap generation is enabled. */ diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/ObjcConfigurationApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/ObjcConfigurationApi.java index e095bcfb2cd700..76cf5b5f1a3ded 100644 --- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/ObjcConfigurationApi.java +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/ObjcConfigurationApi.java @@ -74,12 +74,6 @@ public interface ObjcConfigurationApi getSimulatorVersionForPlatformType(ApplePlatformTypeApiT platformType); - @StarlarkMethod( - name = "generate_dsym", - doc = "Whether to generate debug symbol(.dSYM) artifacts.", - structField = true) - boolean generateDsym(); - @StarlarkMethod( name = "generate_linkmap", doc = "Whether to generate linkmap artifacts.", diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcStarlarkTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcStarlarkTest.java index bb9bb72681c1fd..b3f1b3e14fcca5 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcStarlarkTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcStarlarkTest.java @@ -687,14 +687,12 @@ public void testStarlarkCanAccessObjcConfiguration() throws Exception { " ios_simulator_device = ctx.fragments.objc.ios_simulator_device", " ios_simulator_version = ctx.fragments.objc.ios_simulator_version", " signing_certificate_name = ctx.fragments.objc.signing_certificate_name", - " generate_dsym = ctx.fragments.objc.generate_dsym", " return MyInfo(", " copts=copts,", " compilation_mode_copts=compilation_mode_copts,", " ios_simulator_device=ios_simulator_device,", " ios_simulator_version=str(ios_simulator_version),", " signing_certificate_name=signing_certificate_name,", - " generate_dsym=generate_dsym,", " )", "swift_binary = rule(", "implementation = swift_binary_impl,", @@ -715,8 +713,7 @@ public void testStarlarkCanAccessObjcConfiguration() throws Exception { "--objccopt=-DTestObjcCopt", "--ios_simulator_device='iPhone 6'", "--ios_simulator_version=8.4", - "--ios_signing_cert_name='Apple Developer'", - "--apple_generate_dsym"); + "--ios_signing_cert_name='Apple Developer'"); ConfiguredTarget starlarkTarget = getConfiguredTarget("//examples/objc_starlark:my_target"); StructImpl myInfo = getMyInfoFromTarget(starlarkTarget); @@ -727,14 +724,12 @@ public void testStarlarkCanAccessObjcConfiguration() throws Exception { Object iosSimulatorDevice = myInfo.getValue("ios_simulator_device"); Object iosSimulatorVersion = myInfo.getValue("ios_simulator_version"); Object signingCertificateName = myInfo.getValue("signing_certificate_name"); - Boolean generateDsym = (Boolean) myInfo.getValue("generate_dsym"); assertThat(copts).contains("-DTestObjcCopt"); assertThat(compilationModeCopts).containsExactlyElementsIn(ObjcConfiguration.OPT_COPTS); assertThat(iosSimulatorDevice).isEqualTo("'iPhone 6'"); assertThat(iosSimulatorVersion).isEqualTo("8.4"); assertThat(signingCertificateName).isEqualTo("'Apple Developer'"); - assertThat(generateDsym).isTrue(); } @Test From 064c731275f5884b1fe2ee869d3500b7be4f42bf Mon Sep 17 00:00:00 2001 From: waltl Date: Fri, 30 Apr 2021 06:15:11 -0700 Subject: [PATCH 2/2] Delete obsolete features (use_objc_modules, no_enable_modules) PiperOrigin-RevId: 371319929 --- .../util/mock/osx_cc_toolchain_config.bzl | 32 ----------------- tools/osx/crosstool/cc_toolchain_config.bzl | 36 ------------------- 2 files changed, 68 deletions(-) diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/mock/osx_cc_toolchain_config.bzl b/src/test/java/com/google/devtools/build/lib/packages/util/mock/osx_cc_toolchain_config.bzl index 339117eb5dae2d..75c68cc0757898 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/mock/osx_cc_toolchain_config.bzl +++ b/src/test/java/com/google/devtools/build/lib/packages/util/mock/osx_cc_toolchain_config.bzl @@ -5232,25 +5232,6 @@ def _impl(ctx): has_configured_linker_path_feature = feature(name = "has_configured_linker_path") - use_objc_modules_feature = feature( - name = "use_objc_modules", - flag_sets = [ - flag_set( - actions = [ACTION_NAMES.objc_compile, ACTION_NAMES.objcpp_compile], - flag_groups = [ - flag_group( - flags = [ - "-fmodule-name=%{module_name}", - "-iquote", - "%{module_maps_dir}", - "-fmodules-cache-path=%{modules_cache_path}", - ], - ), - ], - ), - ], - ) - language_objc_feature = feature( name = "lang_objc", provides = [ @@ -6855,17 +6836,6 @@ def _impl(ctx): ], ) - no_enable_modules_feature = feature( - name = "no_enable_modules", - flag_sets = [ - flag_set( - actions = [ACTION_NAMES.objc_compile, ACTION_NAMES.objcpp_compile], - flag_groups = [flag_group(flags = ["-fmodule-maps"])], - ), - ], - requires = [feature_set(features = ["use_objc_modules"])], - ) - autofdo_feature = feature( name = "autofdo", flag_sets = [ @@ -7907,8 +7877,6 @@ def _impl(ctx): force_pic_flags_feature, pch_feature, module_maps_feature, - use_objc_modules_feature, - no_enable_modules_feature, apply_default_warnings_feature, preprocessor_defines_feature, xcode_5_0_feature, diff --git a/tools/osx/crosstool/cc_toolchain_config.bzl b/tools/osx/crosstool/cc_toolchain_config.bzl index 9d44092f3db36b..57c710cc08731a 100644 --- a/tools/osx/crosstool/cc_toolchain_config.bzl +++ b/tools/osx/crosstool/cc_toolchain_config.bzl @@ -3341,25 +3341,6 @@ def _impl(ctx): ], ) - use_objc_modules_feature = feature( - name = "use_objc_modules", - flag_sets = [ - flag_set( - actions = [ACTION_NAMES.objc_compile, ACTION_NAMES.objcpp_compile], - flag_groups = [ - flag_group( - flags = [ - "-fmodule-name=%{module_name}", - "-iquote", - "%{module_maps_dir}", - "-fmodules-cache-path=%{modules_cache_path}", - ], - ), - ], - ), - ], - ) - objc_arc_feature = feature( name = "objc_arc", flag_sets = [ @@ -3985,17 +3966,6 @@ def _impl(ctx): ], ) - no_enable_modules_feature = feature( - name = "no_enable_modules", - flag_sets = [ - flag_set( - actions = [ACTION_NAMES.objc_compile, ACTION_NAMES.objcpp_compile], - flag_groups = [flag_group(flags = ["-fmodule-maps"])], - ), - ], - requires = [feature_set(features = ["use_objc_modules"])], - ) - pic_feature = feature( name = "pic", enabled = True, @@ -6347,8 +6317,6 @@ def _impl(ctx): force_pic_flags_feature, pch_feature, module_maps_feature, - use_objc_modules_feature, - no_enable_modules_feature, apply_default_warnings_feature, includes_feature, include_paths_feature, @@ -6429,8 +6397,6 @@ def _impl(ctx): force_pic_flags_feature, pch_feature, module_maps_feature, - use_objc_modules_feature, - no_enable_modules_feature, apply_default_warnings_feature, includes_feature, include_paths_feature, @@ -6510,8 +6476,6 @@ def _impl(ctx): force_pic_flags_feature, pch_feature, module_maps_feature, - use_objc_modules_feature, - no_enable_modules_feature, apply_default_warnings_feature, includes_feature, include_paths_feature,