diff options
author | 2016-05-02 15:46:14 +0000 | |
---|---|---|
committer | 2016-05-03 08:36:59 +0000 | |
commit | b8e1755c91ef2f033bc4f45be16efa6e33319c43 (patch) | |
tree | 0e2f2b9c02671d38fc5f1100de0702ebceb11d12 /src/main/java | |
parent | 43e620bfcd20ea24f079b0aec5eacf2b0f6c8a4e (diff) |
Expose platform frameworks dir to Skylark.
* Adds a new method to get Xcode's developer frameworks dir.
* Removes platform_dir() as it cannot be used in Skylark as-is - there's no way to get the platform name it requires.
--
MOS_MIGRATED_REVID=121275439
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/apple/AppleToolchain.java | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleToolchain.java index c0fd467687..8bf283e8a1 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleToolchain.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleToolchain.java @@ -96,15 +96,6 @@ public class AppleToolchain { return platformDir(getPlatformPlistName(configuration)); } - /** - * Returns the platform directory inside of Xcode for a given platform name (e.g. iphoneos). - */ - @SkylarkCallable( - name = "platform_dir", - doc = - "Returns a placeholder for the platform directory inside of Xcode for a given platform " - + " name (e.g. iphoneos). This placeholder is resolved by xcrunwrapper." - ) public static String platformDir(String platformName) { return DEVELOPER_DIR + "/Platforms/" + platformName + ".platform"; } @@ -123,6 +114,10 @@ public class AppleToolchain { /** * Returns the platform frameworks directory inside of Xcode for a given configuration. */ + @SkylarkCallable( + name = "platform_developer_framework_dir", + doc = "Returns the platform frameworks directory inside of Xcode for a given configuration." + ) public static String platformDeveloperFrameworkDir(AppleConfiguration configuration) { return platformDir(configuration) + "/Developer/Library/Frameworks"; } |