Merge "Now gnu11 is the default, bump experimental to gnu17." am: 51cb2d9374
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2097173 Change-Id: I7cc6b02ea9535e2a7d32de930e54a61f8d7c8935 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1914,9 +1914,9 @@ func TestCcLibraryCppStdWithGnuExtensions_ConvertsToFeatureAttr(t *testing.T) {
|
||||
{cpp_std: "gnu++17", gnu_extensions: "true", bazel_cpp_std: "gnu++17"},
|
||||
|
||||
// some c_std test cases
|
||||
{c_std: "experimental", gnu_extensions: "", bazel_c_std: "gnu11"},
|
||||
{c_std: "experimental", gnu_extensions: "false", bazel_cpp_std: "c++17", bazel_c_std: "c11"},
|
||||
{c_std: "experimental", gnu_extensions: "true", bazel_c_std: "gnu11"},
|
||||
{c_std: "experimental", gnu_extensions: "", bazel_c_std: "gnu17"},
|
||||
{c_std: "experimental", gnu_extensions: "false", bazel_cpp_std: "c++17", bazel_c_std: "c17"},
|
||||
{c_std: "experimental", gnu_extensions: "true", bazel_c_std: "gnu17"},
|
||||
{c_std: "gnu11", cpp_std: "gnu++17", gnu_extensions: "", bazel_cpp_std: "gnu++17", bazel_c_std: "gnu11"},
|
||||
{c_std: "gnu11", cpp_std: "gnu++17", gnu_extensions: "false", bazel_cpp_std: "c++17", bazel_c_std: "c11"},
|
||||
{c_std: "gnu11", cpp_std: "gnu++17", gnu_extensions: "true", bazel_cpp_std: "gnu++17", bazel_c_std: "gnu11"},
|
||||
|
@@ -281,7 +281,7 @@ var (
|
||||
|
||||
CStdVersion = "gnu11"
|
||||
CppStdVersion = "gnu++17"
|
||||
ExperimentalCStdVersion = "gnu11"
|
||||
ExperimentalCStdVersion = "gnu17"
|
||||
ExperimentalCppStdVersion = "gnu++2a"
|
||||
|
||||
// prebuilts/clang default settings.
|
||||
|
Reference in New Issue
Block a user