diff options
| author |  Chris Parsons <cparsons@google.com> | 2017-01-27 15:54:24 +0000 |
|---|---|---|
| committer |  Yun Peng <pcloudy@google.com> | 2017-01-30 09:01:10 +0000 |
| commit | a4d719d8a9f897cf372abdadcfa250358f3e0d58 (patch) | |
| tree | 55c83cbb1612a3f367af202d94e2257a831b9a8f /src/main/java/com/google | |
| parent | d9d20f734943b4bfdb93f1a9756593be7ef7654d (diff) | |
Framework resource deduping (framework resources are kept in the framework bundle, not the top level)
--
PiperOrigin-RevId: 145795138
MOS_MIGRATED_REVID=145795138
Diffstat (limited to 'src/main/java/com/google')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java | 12 |
1 files changed, 1 insertions, 11 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 547a404706..bc497f91ed 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 @@ -465,15 +465,10 @@ public final class ObjcProvider extends SkylarkClassObject implements Transitive */ private static final ImmutableSet<Key<?>> NON_SUBTRACTABLE_KEYS = ImmutableSet.<Key<?>>of( - ASSET_CATALOG, - BUNDLE_FILE, - BUNDLE_IMPORT_DIR, DEFINE, DYNAMIC_FRAMEWORK_DIR, DYNAMIC_FRAMEWORK_FILE, FLAG, - GENERAL_RESOURCE_DIR, - GENERAL_RESOURCE_FILE, MERGE_ZIP, ROOT_MERGE_ZIP, FRAMEWORK_SEARCH_PATH_ONLY, @@ -483,12 +478,7 @@ public final class ObjcProvider extends SkylarkClassObject implements Transitive LINKOPT, SDK_DYLIB, SDK_FRAMEWORK, - STORYBOARD, - STRINGS, - WEAK_SDK_FRAMEWORK, - XCASSETS_DIR, - XCDATAMODEL, - XIB); + WEAK_SDK_FRAMEWORK); /** * Returns the skylark key for the given string, or null if no such key exists or is available |