Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ec36ada authored by Liz Kammer's avatar Liz Kammer Committed by Gerrit Code Review
Browse files

Merge "Add rust bp2build tests to soong tests" into main

parents ec6f10f6 267f1f71

bp2build/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ bootstrap_go_package { 
        "soong-genrule",

        "soong-linkerconfig",

        "soong-python",

        "soong-rust",

        "soong-sh",

        "soong-shared",

        "soong-starlark-format",
@@ -82,6 +83,10 @@ bootstrap_go_package { 
        "python_binary_conversion_test.go",

        "python_library_conversion_test.go",

        "python_test_conversion_test.go",

        "rust_binary_conversion_test.go",

        "rust_library_conversion_test.go",

        "rust_proc_macro_conversion_test.go",

        "rust_protobuf_conversion_test.go",

        "sh_conversion_test.go",

        "sh_test_conversion_test.go",

        "soong_config_module_type_conversion_test.go",

bp2build/rust_binary_conversion_test.go

+14 −0
Original line number Diff line number Diff line 
// Copyright 2023 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.



package bp2build



import (

bp2build/rust_library_conversion_test.go

+14 −0
Original line number Diff line number Diff line 
// Copyright 2023 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.



package bp2build



import (

bp2build/rust_proc_macro_conversion_test.go

+15 −1
Original line number Diff line number Diff line 
// Copyright 2023 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.



package bp2build



import (
@@ -17,7 +31,7 @@ func registerRustProcMacroModuleTypes(ctx android.RegistrationContext) { 
}



func TestRustProcMacroLibrary(t *testing.T) {

	runRustLibraryTestCase(t, Bp2buildTestCase{

	rustRustProcMacroTestCase(t, Bp2buildTestCase{

		Dir:       "external/rust/crates/foo",

		Blueprint: "",

		Filesystem: map[string]string{

bp2build/rust_protobuf_conversion_test.go

+14 −0
Original line number Diff line number Diff line 
// Copyright 2023 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.



package bp2build



import (