From e7fe50aa727df9ef0a3d37fa258d017971035515 Mon Sep 17 00:00:00 2001 From: Googler Date: Sat, 29 Apr 2017 04:44:11 +0200 Subject: 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 --- .../java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java') 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 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); } -- cgit v1.2.3