diff options
author | 2016-07-27 16:34:27 +0000 | |
---|---|---|
committer | 2016-07-28 18:36:29 -0400 | |
commit | a1a31ff6d16811dc72df32861bd1c1a98e104f02 (patch) | |
tree | ea94d4c1e7fa41f38be174a73f618152e18f1d65 /src/main/java/com/google/devtools/build/lib/rules/objc/CompilationAttributes.java | |
parent | b6b1a3f0670c7e62cec408b06a13ae02bbe1b42f (diff) |
Rename some PackageId and RepositoryName fields/methods in prep for deep execroot change
This is in prep for making the execution root path for external repositories
../repo_name (instead of external/repo_name). Right now, the getRunfilesPath() returns that path, so that is renamed getExecRoot() (since the runfiles are really just a reflection of the execRoot structure). getSourceRoot() replaces getPathFragment, which has always been a confusing name (it's not clear from the name
what the difference is between it and getPackageFragment()). It returns the relative path to source files for external repositories (external/repo_name).
Also renamed/moved to more sensible class a few static RepositoryName fields.
--
MOS_MIGRATED_REVID=128594419
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/CompilationAttributes.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/CompilationAttributes.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationAttributes.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationAttributes.java index f41b101c2f..3e15538b79 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationAttributes.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationAttributes.java @@ -315,7 +315,7 @@ final class CompilationAttributes { builder.addModuleMapsForDirectDeps(moduleMaps.build()); PathFragment packageFragment = - ruleContext.getLabel().getPackageIdentifier().getPathFragment(); + ruleContext.getLabel().getPackageIdentifier().getSourceRoot(); if (packageFragment != null) { builder.setPackageFragment(packageFragment); } |