Rollback of commit 7a668370e350f602ec863eb4169729885e1c7c93.

*** Reason for rollback ***

Fails test_swift_import_objc_framework of //src/test/shell/bazel/apple:bazel_apple_test

Tested on: https://cr.bazel.build/7611/

Fixes #2179.

*** Original change description ***

Split ObjcProvider.framework_dir into static and dynamic framework directories.

***

--
Change-Id: I10db5e14b219bc921bff72c45fab1455be8fa25a
Reviewed-on: https://cr.bazel.build/7311
PiperOrigin-RevId: 141043141
MOS_MIGRATED_REVID=141043141

1 files changed, 5 insertions, 16 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
index 3c2bac6d4d..667753d701 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
@@ -243,22 +243,12 @@ public final class ObjcProvider extends SkylarkClassObject implements Transitive
       new Key<>(STABLE_ORDER, "root_merge_zip", Artifact.class);
 
   /**
-   * Exec paths of {@code .framework} directories corresponding to static frameworks to link. These
-   * cause -F arguments (framework search paths) to be added to each compile action, and
-   * -framework (link framework) arguments to be added to each link action. These differ from
-   * dynamic frameworks in that they are statically linked into the binary.
+   * Exec paths of {@code .framework} directories corresponding to frameworks to link. These cause
+   * -F arguments (framework search paths) to be added to each compile action, and -framework (link
+   * framework) arguments to be added to each link action.
    */
-  public static final Key<PathFragment> STATIC_FRAMEWORK_DIR =
+  public static final Key<PathFragment> FRAMEWORK_DIR =
       new Key<>(LINK_ORDER, "framework_dir", PathFragment.class);
-  
-  /**
-   * Exec paths of {@code .framework} directories corresponding to dynamic frameworks to link. These
-   * cause -F arguments (framework search paths) to be added to each compile action, and
-   * -framework (link framework) arguments to be added to each link action. These differ from
-   * static frameworks in that they are not statically linked into the binary.
-   */
-  public static final Key<PathFragment> DYNAMIC_FRAMEWORK_DIR =
-      new Key<>(LINK_ORDER, "dynamic_framework_dir", PathFragment.class);
 
   /**
    * Exec paths of {@code .framework} directories corresponding to frameworks to include in search
@@ -392,11 +382,11 @@ public final class ObjcProvider extends SkylarkClassObject implements Transitive
           BUNDLE_FILE,
           BUNDLE_IMPORT_DIR,
           DEFINE,
-          DYNAMIC_FRAMEWORK_DIR,
           DYNAMIC_FRAMEWORK_FILE,
           DEBUG_SYMBOLS,
           DEBUG_SYMBOLS_PLIST,
           EXPORTED_DEBUG_ARTIFACTS,
+          FRAMEWORK_DIR,
           FRAMEWORK_SEARCH_PATH_ONLY,
           FORCE_LOAD_LIBRARY,
           GENERAL_RESOURCE_DIR,
@@ -421,7 +411,6 @@ public final class ObjcProvider extends SkylarkClassObject implements Transitive
           SDK_DYLIB,
           SDK_FRAMEWORK,
           SOURCE,
-          STATIC_FRAMEWORK_DIR,
           STATIC_FRAMEWORK_FILE,
           STORYBOARD,
           STRINGS,