diff options
author | 2015-10-12 18:40:28 +0000 | |
---|---|---|
committer | 2015-10-13 01:01:49 +0000 | |
commit | a9afb6969cb91c1c48dddc9b3992e715b418a263 (patch) | |
tree | 312ddde71b4fc103d0a1dd35806f0bbd8bb60193 /src/main/java/com/google/devtools/build/lib | |
parent | 4b25ee03949babef7ea71f65a11a757ee04b1b75 (diff) |
Rename IOS_SDK_VERSION_OVERRIDE to APPLE_SDK_VERSION_OVERRIDE, as it need not be locked to iOS SDK.
--
MOS_MIGRATED_REVID=105231425
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java | 8 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java index b420b47848..50f73c1900 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java @@ -50,10 +50,10 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment { private static final String XCODE_VERSION_ENV_NAME = "XCODE_VERSION_OVERRIDE"; /** - * Environment variable name for the iOS SDK version. If unset, uses the system default of the - * host. + * Environment variable name for the apple SDK version. If unset, uses the system default of the + * host for the platform in the value of {@link #APPLE_SDK_PLATFORM_ENV_NAME}. **/ - public static final String IOS_SDK_VERSION_ENV_NAME = "IOS_SDK_VERSION_OVERRIDE"; + public static final String APPLE_SDK_VERSION_ENV_NAME = "APPLE_SDK_VERSION_OVERRIDE"; /** * Environment variable name for the apple SDK platform. This should be set for all actions that * require an apple SDK. The valid values consist of {@link Platform} names. @@ -127,7 +127,7 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment { if (xcodeVersionOverride.isPresent()) { builder.put(XCODE_VERSION_ENV_NAME, xcodeVersionOverride.get()); } - builder.put(IOS_SDK_VERSION_ENV_NAME, iosSdkVersion); + builder.put(APPLE_SDK_VERSION_ENV_NAME, iosSdkVersion); builder.put(APPLE_SDK_PLATFORM_ENV_NAME, IosSdkCommands.getPlatformPlistName(this)); return builder.build(); } diff --git a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java index 64d3cd15f4..890036b9b1 100644 --- a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategy.java @@ -152,12 +152,12 @@ public class StandaloneSpawnStrategy implements SpawnActionContext { throws UserExecException { ImmutableMap.Builder<String, String> newEnvBuilder = ImmutableMap.builder(); newEnvBuilder.putAll(env); - if (env.containsKey(ObjcConfiguration.IOS_SDK_VERSION_ENV_NAME)) { + if (env.containsKey(ObjcConfiguration.APPLE_SDK_VERSION_ENV_NAME)) { // The Apple platform is needed to select the appropriate SDK. if (!env.containsKey(ObjcConfiguration.APPLE_SDK_PLATFORM_ENV_NAME)) { throw new UserExecException("Could not resolve apple platform for determining SDK"); } - String iosSdkVersion = env.get(ObjcConfiguration.IOS_SDK_VERSION_ENV_NAME); + String iosSdkVersion = env.get(ObjcConfiguration.APPLE_SDK_VERSION_ENV_NAME); String appleSdkPlatform = env.get(ObjcConfiguration.APPLE_SDK_PLATFORM_ENV_NAME); // TODO(bazel-team): Determine and set DEVELOPER_DIR. addSdkRootEnv(newEnvBuilder, iosSdkVersion, appleSdkPlatform); |