aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
authorGravatar cparsons <cparsons@google.com>2017-08-29 22:37:30 +0200
committerGravatar Vladimir Moskva <vladmos@google.com>2017-08-30 13:48:20 +0200
commit7cc11272581a53e115f672404fb2d8e1dd5d18df (patch)
tree728dbbf8a447bdb22df98c158ed2a72527213d21 /src/main
parent32b85516fc3ad554ec3a54d3e9cf0ee66b81127c (diff)
Remove TODO regarding removal of a couple ObjcProvider keys.
it turns out these keys are still used by objc_framework, so cannot be removed. RELNOTES: None. PiperOrigin-RevId: 166895085
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
index ae1c7b7f14..cd08ee7d1e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
@@ -429,8 +429,6 @@ public final class ObjcCommon {
for (ObjcProvider provider : runtimeDepObjcProviders) {
objcProvider.addTransitiveAndPropagate(ObjcProvider.DYNAMIC_FRAMEWORK_FILE, provider);
- // TODO(b/28637288): Remove STATIC_FRAMEWORK_FILE and MERGE_ZIP when they are
- // no longer provided by ios_framework.
objcProvider.addTransitiveAndPropagate(ObjcProvider.STATIC_FRAMEWORK_FILE, provider);
objcProvider.addTransitiveAndPropagate(ObjcProvider.MERGE_ZIP, provider);
}