diff options
author | Alex Humesky <ahumesky@google.com> | 2016-04-06 22:12:42 +0000 |
---|---|---|
committer | Lukacs Berki <lberki@google.com> | 2016-04-07 11:48:58 +0000 |
commit | d340525bcec2ff0c4dbae1ff2e2958d0fea470b1 (patch) | |
tree | d939be57e8f6ecd5ff3bb563698d49f49545288c /src/main | |
parent | 0fd2273e1ee6433dddefd7a1754fdcd9915fd897 (diff) |
Moves Android NDK support for NDK r10e to a separate package in preparation
for adding support for NDK r11.
--
MOS_MIGRATED_REVID=119207577
Diffstat (limited to 'src/main')
11 files changed, 23 insertions, 27 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryFunction.java index 2dbb030384..469b2435c6 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryFunction.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryFunction.java @@ -16,13 +16,13 @@ package com.google.devtools.build.lib.bazel.rules.android; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.RuleDefinition; -import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.AndroidNdkCrosstools; -import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.AndroidNdkCrosstools.NdkCrosstoolsException; -import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.ApiLevel; -import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.NdkPaths; import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.NdkRelease; -import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.StlImpl; -import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.StlImpls; +import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.r10e.AndroidNdkCrosstoolsR10e; +import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.r10e.AndroidNdkCrosstoolsR10e.NdkCrosstoolsException; +import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.r10e.ApiLevel; +import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.r10e.NdkPaths; +import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.r10e.StlImpl; +import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.r10e.StlImpls; import com.google.devtools.build.lib.packages.AttributeMap; import com.google.devtools.build.lib.packages.NonconfigurableAttributeMapper; import com.google.devtools.build.lib.packages.Rule; @@ -105,16 +105,15 @@ public class AndroidNdkRepositoryFunction extends RepositoryFunction { ImmutableList.Builder<CrosstoolStlPair> crosstoolsAndStls = ImmutableList.builder(); try { - String hostPlatform = AndroidNdkCrosstools.getHostPlatform(ndkRelease); + String hostPlatform = AndroidNdkCrosstoolsR10e.getHostPlatform(ndkRelease); NdkPaths ndkPaths = new NdkPaths(ruleName, hostPlatform, apiLevel); for (StlImpl stlImpl : StlImpls.get(ndkPaths)) { - CrosstoolRelease crosstoolRelease = AndroidNdkCrosstools.create( + CrosstoolRelease crosstoolRelease = AndroidNdkCrosstoolsR10e.create( env.getListener(), ndkPaths, ruleName, - apiLevel, ndkRelease, stlImpl, hostPlatform); diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryRule.java index 2afc5b52a8..0a91e21ce3 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryRule.java @@ -21,7 +21,7 @@ import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; -import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.StlImpls; +import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.r10e.StlImpls; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.packages.RuleClass; diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/NdkRelease.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/NdkRelease.java index c2b28a9488..16d9b671ad 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/NdkRelease.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/NdkRelease.java @@ -52,7 +52,7 @@ public class NdkRelease { /** * Guesses the bit-ness of the NDK based on the current platform. */ - static NdkRelease guessBitness(String baseReleaseString) { + public static NdkRelease guessBitness(String baseReleaseString) { NdkRelease baseRelease = create(baseReleaseString); boolean is64Bit = (CPU.getCurrent() == CPU.X86_64); return new NdkRelease( diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/AndroidNdkCrosstools.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r10e/AndroidNdkCrosstoolsR10e.java index 00ab59e773..23fe66b2ac 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/AndroidNdkCrosstools.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r10e/AndroidNdkCrosstoolsR10e.java @@ -12,10 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools; +package com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.r10e; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.NdkRelease; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.util.OS; @@ -30,9 +31,8 @@ import java.util.Map.Entry; /** * Generates a CrosstoolRelease proto for the Android NDK. */ -public class AndroidNdkCrosstools { +public class AndroidNdkCrosstoolsR10e { - // TODO(bazel-team): Support future versions of the NDK. private static final String KNOWN_NDK_REVISION = "r10e"; /** @@ -44,7 +44,7 @@ public class AndroidNdkCrosstools { } } - private AndroidNdkCrosstools() {} + private AndroidNdkCrosstoolsR10e() {} /** * Creates a CrosstoolRelease proto for the Android NDK, given the API level to use and the @@ -57,19 +57,16 @@ public class AndroidNdkCrosstools { * @param eventHandler The event handler for sending warning messages. * @param repositoryName The name of the repository, which should correspond to the name of the * android_ndk_repository rule. - * @param apiLevel The API level used for the NDK. * @param ndkRelease The NDK release * @return A CrosstoolRelease for the Android NDK. - * @throws NdkCrosstoolsException If the crosstool could not be created. */ public static CrosstoolRelease create( EventHandler eventHandler, NdkPaths ndkPaths, String repositoryName, - ApiLevel apiLevel, NdkRelease ndkRelease, StlImpl stlImpl, - String hostPlatform) throws NdkCrosstoolsException { + String hostPlatform) { // Check that the Android NDK revision is both valid and one we know about. if (!ndkRelease.isValid) { diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/ApiLevel.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r10e/ApiLevel.java index 500611a7ae..d5f44265b4 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/ApiLevel.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r10e/ApiLevel.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools; +package com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.r10e; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMap; @@ -114,7 +114,7 @@ public class ApiLevel { /** * Translates the given API level to the equivalent API level in the NDK. */ - static String getCorrectedApiLevel( + private static String getCorrectedApiLevel( EventHandler eventHandler, String repositoryName, String apiLevel) { String correctedApiLevel = API_EQUIVALENCIES.get(apiLevel); diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/ArmCrosstools.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r10e/ArmCrosstools.java index 43f61c9659..c2b6a4954b 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/ArmCrosstools.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r10e/ArmCrosstools.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools; +package com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.r10e; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.rules.cpp.CppConfiguration; diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/MipsCrosstools.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r10e/MipsCrosstools.java index d365bda53e..e9ef3cb23a 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/MipsCrosstools.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r10e/MipsCrosstools.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools; +package com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.r10e; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.rules.cpp.CppConfiguration; diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/NdkPaths.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r10e/NdkPaths.java index 40d98612bc..084601e75b 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/NdkPaths.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r10e/NdkPaths.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools; +package com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.r10e; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.rules.cpp.CppConfiguration; diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/StlImpl.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r10e/StlImpl.java index d8e793df78..e763ba314a 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/StlImpl.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r10e/StlImpl.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools; +package com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.r10e; import com.google.common.base.Verify; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/StlImpls.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r10e/StlImpls.java index 90cb21f793..dc5d13695e 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/StlImpls.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r10e/StlImpls.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools; +package com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.r10e; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CToolchain.Builder; diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/X86Crosstools.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r10e/X86Crosstools.java index fc832835b0..3583d0519a 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/X86Crosstools.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r10e/X86Crosstools.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools; +package com.google.devtools.build.lib.bazel.rules.android.ndkcrosstools.r10e; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.rules.cpp.CppConfiguration; |