Merge "bp2build: cc_object converter." (4e86b6ae) · Commits · e / os / android_build_soong

bp2build/Android.bp

+2 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,8 @@ bootstrap_go_package {
		testSrcs: [
		"build_conversion_test.go",
		"bzl_conversion_test.go",
		"cc_conversion_test.go",
		"cc_library_headers_conversion_test.go",
		"cc_object_conversion_test.go",
		"conversion_test.go",
		"sh_conversion_test.go",
		"testing.go",

bp2build/cc_conversion_test.go→bp2build/cc_library_headers_conversion_test.go

+0 −0

File moved.

View file

bp2build/cc_object_conversion_test.go

0 → 100644

+186 −0

Original line number	Diff line number	Diff line
		// Copyright 2021 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 (
		"android/soong/android"
		"android/soong/cc"
		"fmt"
		"strings"
		"testing"
		)

		func TestCcObjectBp2Build(t *testing.T) {
		testCases := []struct {
		description string
		moduleTypeUnderTest string
		moduleTypeUnderTestFactory android.ModuleFactory
		moduleTypeUnderTestBp2BuildMutator func(android.TopDownMutatorContext)
		blueprint string
		expectedBazelTargets []string
		filesystem map[string]string
		}{
		{
		description: "simple cc_object generates cc_object with include header dep",
		moduleTypeUnderTest: "cc_object",
		moduleTypeUnderTestFactory: cc.ObjectFactory,
		moduleTypeUnderTestBp2BuildMutator: cc.ObjectBp2Build,
		filesystem: map[string]string{
		"a/b/foo.h": "",
		"a/b/bar.h": "",
		"a/b/c.c": "",
		},
		blueprint: `cc_object {
		name: "foo",
		local_include_dirs: ["include"],
		cflags: [
		"-Wno-gcc-compat",
		"-Wall",
		"-Werror",
		],
		srcs: [
		"a/b/*.h",
		"a/b/c.c"
		],

		bazel_module: { bp2build_available: true },
		}
		`,
		expectedBazelTargets: []string{`cc_object(
		name = "foo",
		copts = [
		"-fno-addrsig",
		"-Wno-gcc-compat",
		"-Wall",
		"-Werror",
		],
		local_include_dirs = [
		"include",
		],
		srcs = [
		"a/b/bar.h",
		"a/b/foo.h",
		"a/b/c.c",
		],
		)`,
		},
		},
		{
		description: "simple cc_object with defaults",
		moduleTypeUnderTest: "cc_object",
		moduleTypeUnderTestFactory: cc.ObjectFactory,
		moduleTypeUnderTestBp2BuildMutator: cc.ObjectBp2Build,
		blueprint: `cc_object {
		name: "foo",
		local_include_dirs: ["include"],
		srcs: [
		"a/b/*.h",
		"a/b/c.c"
		],

		defaults: ["foo_defaults"],
		bazel_module: { bp2build_available: true },
		}

		cc_defaults {
		name: "foo_defaults",
		defaults: ["foo_bar_defaults"],
		// TODO(b/178130668): handle configurable attributes that depend on the platform
		arch: {
		x86: {
		cflags: ["-fPIC"],
		},
		x86_64: {
		cflags: ["-fPIC"],
		},
		},
		}

		cc_defaults {
		name: "foo_bar_defaults",
		cflags: [
		"-Wno-gcc-compat",
		"-Wall",
		"-Werror",
		],
		}
		`,
		expectedBazelTargets: []string{`cc_object(
		name = "foo",
		copts = [
		"-Wno-gcc-compat",
		"-Wall",
		"-Werror",
		"-fno-addrsig",
		],
		local_include_dirs = [
		"include",
		],
		srcs = [
		"a/b/c.c",
		],
		)`,
		},
		},
		}

		dir := "."
		for _, testCase := range testCases {
		filesystem := make(map[string][]byte)
		toParse := []string{
		"Android.bp",
		}
		for f, content := range testCase.filesystem {
		if strings.HasSuffix(f, "Android.bp") {
		toParse = append(toParse, f)
		}
		filesystem[f] = []byte(content)
		}
		config := android.TestConfig(buildDir, nil, testCase.blueprint, filesystem)
		ctx := android.NewTestContext(config)
		// Always register cc_defaults module factory
		ctx.RegisterModuleType("cc_defaults", func() android.Module { return cc.DefaultsFactory() })

		ctx.RegisterModuleType(testCase.moduleTypeUnderTest, testCase.moduleTypeUnderTestFactory)
		ctx.RegisterBp2BuildMutator(testCase.moduleTypeUnderTest, testCase.moduleTypeUnderTestBp2BuildMutator)
		ctx.RegisterForBazelConversion()

		_, errs := ctx.ParseFileList(dir, toParse)
		if Errored(t, testCase.description, errs) {
		continue
		}
		_, errs = ctx.ResolveDependencies(config)
		if Errored(t, testCase.description, errs) {
		continue
		}

		bazelTargets := GenerateBazelTargets(ctx.Context.Context, Bp2Build)[dir]
		if actualCount, expectedCount := len(bazelTargets), len(testCase.expectedBazelTargets); actualCount != expectedCount {
		fmt.Println(bazelTargets)
		t.Errorf("%s: Expected %d bazel target, got %d", testCase.description, expectedCount, actualCount)
		} else {
		for i, target := range bazelTargets {
		if w, g := testCase.expectedBazelTargets[i], target.content; w != g {
		t.Errorf(
		"%s: Expected generated Bazel target to be '%s', got '%s'",
		testCase.description,
		w,
		g,
		)
		}
		}
		}
		}
		}

cc/cc.go

+3 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import (
		"github.com/google/blueprint/proptools"

		"android/soong/android"
		"android/soong/bazel"
		"android/soong/cc/config"
		"android/soong/genrule"
		)
		@@ -364,6 +365,8 @@ type BaseProperties struct {
		// can depend on libraries that are not exported by the APEXes and use private symbols
		// from the exported libraries.
		Test_for []string

		bazel.Properties
		}

		type VendorProperties struct {

cc/library.go

+0 −4

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import (
		"github.com/google/blueprint/pathtools"

		"android/soong/android"
		"android/soong/bazel"
		"android/soong/cc/config"
		)

		@@ -121,9 +120,6 @@ type LibraryProperties struct {
		// If this is an LLNDK library, properties to describe the LLNDK stubs. Will be copied from
		// the module pointed to by llndk_stubs if it is set.
		Llndk llndkLibraryProperties

		// Properties for Bazel migration purposes.
		bazel.Properties
		}

		// StaticProperties is a properties stanza to affect only attributes of the "static" variants of a