-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove errant paths from crosstool test files.
Also includes the following changes: Introduce a helper class for low-boilerplate time measurements and logging. -- Removed attribute "args" from java_test. -- Adds the arm64, mips, mips64, x86, and x86_64 toolchains in the Android NDK This adds the precited targets to the crosstools file generated by the android_ndk_repository rule. The crosstools support NDK revision r10e-rc4. RELNOTES: arm64, mips, mips64, x86, and x86_64 NDK toolchains added to android_ndk_repository in Bazel -- MOS_MIGRATED_REVID=100953441
- Loading branch information
Showing
20 changed files
with
54,318 additions
and
240 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 22 additions & 6 deletions
28
...google/devtools/build/lib/bazel/rules/android/android_ndk_cc_toolchain_suite_template.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,34 @@ | ||
| # Copyright 2015 Google Inc. All rights reserved. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| # This build file was automatically generated for the | ||
| # android_ndk_repository rule "%ruleName%" | ||
|
|
||
| package(default_visibility = ["//visibility:public"]) | ||
|
|
||
| cc_toolchain_suite( | ||
| name = "toolchain", | ||
| toolchains = { %toolchain_map% }, | ||
| toolchains = { | ||
| %toolchainMap% | ||
| }, | ||
| proto = """ | ||
| major_version: "android" | ||
| minor_version: "" | ||
| default_target_cpu: "%default_cpu%" | ||
| %toolchain_protos% | ||
| %crosstoolReleaseProto% | ||
| """) | ||
|
|
||
| cc_library( | ||
| name = "malloc", | ||
| srcs = [], | ||
| ) | ||
|
|
||
| %toolchains% | ||
| %ccToolchainRules% |
59 changes: 25 additions & 34 deletions
59
...a/com/google/devtools/build/lib/bazel/rules/android/android_ndk_cc_toolchain_template.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,32 @@ | ||
| filegroup( | ||
| name = "%abi%-android-%compiler%-toolchain", | ||
| srcs = glob([ | ||
| "toolchains/%cpu%-linux-androideabi-%compiler%/**", | ||
| ]), | ||
| output_licenses = ["unencumbered"], | ||
| ) | ||
|
|
||
| filegroup( | ||
| name = "%abi%-android-%api_level%-%compiler%-files", | ||
| srcs = [ | ||
| ":everything-%api_level%-%abi%", | ||
| ":%abi%-android-%compiler%-toolchain", | ||
| ], | ||
| ) | ||
| ################################################################ | ||
| # %toolchainName% | ||
| ################################################################ | ||
|
|
||
| cc_toolchain( | ||
| name = "cc-compiler-%abi%", | ||
| all_files = ":%abi%-android-%api_level%-%compiler%-files", | ||
| compiler_files = ":%abi%-android-%compiler%-toolchain", | ||
| cpu = "%abi%", | ||
| dwp_files = ":%abi%-android-%compiler%-toolchain", | ||
| dynamic_runtime_libs = [":%abi%-android-%compiler%-toolchain"], | ||
| linker_files = ":%abi%-android-%compiler%-toolchain", | ||
| objcopy_files = ":%abi%-android-%compiler%-toolchain", | ||
| static_runtime_libs = [":%abi%-android-%compiler%-toolchain"], | ||
| strip_files = ":%abi%-android-%compiler%-toolchain", | ||
| name = "%toolchainName%", | ||
| all_files = ":%toolchainName%-all_files", | ||
| compiler_files = ":%toolchainName%-toolchain_files", | ||
| cpu = "%cpu%", | ||
| dwp_files = ":%toolchainName%-toolchain_files", | ||
| dynamic_runtime_libs = [":%toolchainName%-toolchain_files"], | ||
| linker_files = ":%toolchainName%-toolchain_files", | ||
| objcopy_files = ":%toolchainName%-toolchain_files", | ||
| static_runtime_libs = [":%toolchainName%-toolchain_files"], | ||
| strip_files = ":%toolchainName%-toolchain_files", | ||
| supports_param_files = 0, | ||
| ) | ||
|
|
||
| filegroup( | ||
| name = "everything-%api_level%-%abi%", | ||
| srcs = glob( | ||
| [ | ||
| "ndk/platforms/android-%api_level%/arch-%cpu%/usr/include/**/*.h", | ||
| "ndk/platforms/android-%api_level%/arch-%cpu%/usr/lib/**/*.a", | ||
| "ndk/platforms/android-%api_level%/arch-%cpu%/usr/lib/**/*.o", | ||
| "ndk/platforms/android-%api_level%/arch-%cpu%/usr/lib/**/*.so", | ||
| ], | ||
| ), | ||
| name = "%toolchainName%-toolchain_files", | ||
| srcs = glob(["toolchains/%toolchainDirectory%/**"]), | ||
| output_licenses = ["unencumbered"], | ||
| ) | ||
|
|
||
| filegroup( | ||
| name = "%toolchainName%-all_files", | ||
| srcs = [ | ||
| ":%toolchainName%-toolchain_files", | ||
| ] + glob([ | ||
| %toolchainFileGlobs% | ||
| ]), | ||
| ) |
Oops, something went wrong.