diff options
| author |  Googler <noreply@google.com> | 2017-04-29 04:44:11 +0200 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-04-30 23:14:13 +0200 |
| commit | e7fe50aa727df9ef0a3d37fa258d017971035515 (patch) | |
| tree | 8513a612248d4e3f9f89588d24926c4e8e7f39d9 /src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java | |
| parent | 5f31944b8942818aaf53571c76f5c6a9a9dafc72 (diff) | |
Automated g4 rollback of commit a83a5df53ca184ad59a4a46cd9dfa747bf08007a.
*** Reason for rollback ***
This caused some build breaks.
*** Original change description ***
Custom module map for j2objc_library
PiperOrigin-RevId: 154608761
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java | 5 |
1 files changed, 0 insertions, 5 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 016b687086..3480cfcdef 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 @@ -50,7 +50,6 @@ import static com.google.devtools.build.lib.rules.objc.ObjcProvider.STATIC_FRAME import static com.google.devtools.build.lib.rules.objc.ObjcProvider.STORYBOARD; import static com.google.devtools.build.lib.rules.objc.ObjcProvider.STRINGS; import static com.google.devtools.build.lib.rules.objc.ObjcProvider.TOP_LEVEL_MODULE_MAP; -import static com.google.devtools.build.lib.rules.objc.ObjcProvider.UMBRELLA_HEADER; import static com.google.devtools.build.lib.rules.objc.ObjcProvider.WEAK_SDK_FRAMEWORK; import static com.google.devtools.build.lib.rules.objc.ObjcProvider.XCASSETS_DIR; import static com.google.devtools.build.lib.rules.objc.ObjcProvider.XCDATAMODEL; @@ -576,10 +575,6 @@ public final class ObjcCommon { if (hasModuleMap) { CppModuleMap moduleMap = intermediateArtifacts.moduleMap(); - Optional<Artifact> umbrellaHeader = moduleMap.getUmbrellaHeader(); - if (umbrellaHeader.isPresent()) { - objcProvider.add(UMBRELLA_HEADER, umbrellaHeader.get()); - } objcProvider.add(MODULE_MAP, moduleMap.getArtifact()); objcProvider.add(TOP_LEVEL_MODULE_MAP, moduleMap); } |