aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
authorGravatar Kristina Chodorow <kchodorow@google.com>2015-04-27 23:45:04 +0000
committerGravatar Kristina Chodorow <kchodorow@google.com>2015-04-28 15:15:19 +0000
commitb7cdfa68f20801625e9a83383ce00eb0a1367a47 (patch)
treea53901ba39ecde2308a14a6d1384d8eb22172cd2 /src/main
parentfdc7f98b4e118dfd3580badebaefdd95a372354a (diff)
Fix objective C rules to work with external repositories
getPackageFragment() only returns the relative path within a repository, getPathFragment() is needed to return the external path. -- MOS_MIGRATED_REVID=92196789
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java7
1 files changed, 4 insertions, 3 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 c485cd6cc8..c84c7291d1 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
@@ -136,7 +136,8 @@ public final class ObjcCommon {
*/
ImmutableList<PathFragment> headerSearchPaths() {
ImmutableList.Builder<PathFragment> paths = new ImmutableList.Builder<>();
- PathFragment packageFragment = ruleContext.getLabel().getPackageFragment();
+ PathFragment packageFragment =
+ ruleContext.getLabel().getPackageIdentifier().getPathFragment();
List<PathFragment> rootFragments = ImmutableList.of(
packageFragment,
ruleContext.getConfiguration().getGenfilesFragment().getRelative(packageFragment));
@@ -355,8 +356,8 @@ public final class ObjcCommon {
.addAll(SDK_FRAMEWORK, attributes.sdkFrameworks())
.addAll(WEAK_SDK_FRAMEWORK, attributes.weakSdkFrameworks())
.addAll(SDK_DYLIB, attributes.sdkDylibs());
- }
-
+ }
+
if (resourceAttributes.isPresent()) {
ResourceAttributes attributes = resourceAttributes.get();
objcProvider