diff options
| author |  cparsons <cparsons@google.com> | 2018-05-23 10:12:12 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-23 10:13:24 -0700 |
| commit | 586aedada69d603ed4fc7c6da61c8d9cb86ce808 (patch) | |
| tree | 4a3c774e467d07643baa23ce60b3235f1f5e9853 /src/main/java/com/google/devtools/build/lib/rules/apple | |
| parent | cf3e59d30e56d79163a5006e079e04eadb026541 (diff) | |
Rename an AppleToolchain method to prevent overloading a skylark-exposed method
RELNOTES: None.
PiperOrigin-RevId: 197744356
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/apple')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/apple/AppleToolchain.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java | 2 |
2 files changed, 2 insertions, 2 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 d69da25ab8..cf6cbf5be6 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 @@ -116,7 +116,7 @@ public class AppleToolchain { name = "platform_developer_framework_dir", doc = "Returns the platform frameworks directory inside of Xcode for a given configuration." ) - public static String platformDeveloperFrameworkDir(AppleConfiguration configuration) { + public static String platformFrameworkDirFromConfig(AppleConfiguration configuration) { return platformDeveloperFrameworkDir(configuration.getSingleArchPlatform()); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java index dbe364e662..1f14012e5f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java @@ -96,7 +96,7 @@ public class AppleCcToolchain extends CcToolchain { SDK_FRAMEWORK_DIR_KEY, AppleToolchain.sdkFrameworkDir(platform, ruleContext)) .addStringVariable( PLATFORM_DEVELOPER_FRAMEWORK_DIR, - AppleToolchain.platformDeveloperFrameworkDir(appleConfiguration)) + AppleToolchain.platformFrameworkDirFromConfig(appleConfiguration)) .addStringVariable( XCODE_VERISON_OVERRIDE_VALUE_KEY, appleEnv.getOrDefault(AppleConfiguration.XCODE_VERSION_ENV_NAME, "")) |