bp2build: migrate export_{,system_}include_dirs -> *includes for cc_prebuilt_library{,_static,_shared}
Migrate `export_include_dirs` property to attribute `export_includes`, handling arch/os-variants
Migrate `export_system_include_dirs` property to attribute `export_system_includes`, handling arch/os-variants
Test: cc_prebuilt_library_{,shared_,static_}conversion_test.go
Test: mixed_droid.sh
Bug: 229374533
Change-Id: I658a336a71265af0545c1c2db1a4f6eb613a7366
This commit is contained in:
Alex Márquez Pérez Muñíz Díaz Puras Thaureaux
parent
3848896584
commit
c641cc496b
199
bp2build/cc_prebuilt_library_static_conversion_test.go
Normal file
199
bp2build/cc_prebuilt_library_static_conversion_test.go
Normal file
@@ -0,0 +1,199 @@
|
||||
// Copyright 2022 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 (
|
||||
"testing"
|
||||
|
||||
"android/soong/cc"
|
||||
)
|
||||
|
||||
func runCcPrebuiltLibraryStaticTestCase(t *testing.T, tc Bp2buildTestCase) {
|
||||
t.Parallel()
|
||||
t.Helper()
|
||||
(&tc).ModuleTypeUnderTest = "cc_prebuilt_library_static"
|
||||
(&tc).ModuleTypeUnderTestFactory = cc.PrebuiltStaticLibraryFactory
|
||||
RunBp2BuildTestCaseSimple(t, tc)
|
||||
}
|
||||
|
||||
func TestPrebuiltLibraryStaticSimple(t *testing.T) {
|
||||
runCcPrebuiltLibraryStaticTestCase(t,
|
||||
Bp2buildTestCase{
|
||||
Description: "prebuilt library static simple",
|
||||
Filesystem: map[string]string{
|
||||
"libf.so": "",
|
||||
},
|
||||
Blueprint: `
|
||||
cc_prebuilt_library_static {
|
||||
name: "libtest",
|
||||
srcs: ["libf.so"],
|
||||
bazel_module: { bp2build_available: true },
|
||||
}`,
|
||||
ExpectedBazelTargets: []string{
|
||||
MakeBazelTarget("cc_prebuilt_library_static", "libtest", AttrNameToString{
|
||||
"static_library": `"libf.so"`,
|
||||
}),
|
||||
MakeBazelTarget("cc_prebuilt_library_static", "libtest_alwayslink", AttrNameToString{
|
||||
"static_library": `"libf.so"`,
|
||||
"alwayslink": "True",
|
||||
}),
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func TestPrebuiltLibraryStaticWithArchVariance(t *testing.T) {
|
||||
runCcPrebuiltLibraryStaticTestCase(t,
|
||||
Bp2buildTestCase{
|
||||
Description: "prebuilt library with arch variance",
|
||||
Filesystem: map[string]string{
|
||||
"libf.so": "",
|
||||
"libg.so": "",
|
||||
},
|
||||
Blueprint: `
|
||||
cc_prebuilt_library_static {
|
||||
name: "libtest",
|
||||
arch: {
|
||||
arm64: { srcs: ["libf.so"], },
|
||||
arm: { srcs: ["libg.so"], },
|
||||
},
|
||||
bazel_module: { bp2build_available: true },
|
||||
}`,
|
||||
ExpectedBazelTargets: []string{
|
||||
MakeBazelTarget("cc_prebuilt_library_static", "libtest", AttrNameToString{
|
||||
"static_library": `select({
|
||||
"//build/bazel/platforms/arch:arm": "libg.so",
|
||||
"//build/bazel/platforms/arch:arm64": "libf.so",
|
||||
"//conditions:default": None,
|
||||
})`}),
|
||||
MakeBazelTarget("cc_prebuilt_library_static", "libtest_alwayslink", AttrNameToString{
|
||||
"alwayslink": "True",
|
||||
"static_library": `select({
|
||||
"//build/bazel/platforms/arch:arm": "libg.so",
|
||||
"//build/bazel/platforms/arch:arm64": "libf.so",
|
||||
"//conditions:default": None,
|
||||
})`}),
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func TestPrebuiltLibraryStaticAdditionalAttrs(t *testing.T) {
|
||||
runCcPrebuiltLibraryStaticTestCase(t,
|
||||
Bp2buildTestCase{
|
||||
Description: "prebuilt library additional attributes",
|
||||
Filesystem: map[string]string{
|
||||
"libf.so": "",
|
||||
"testdir/1/include.h": "",
|
||||
"testdir/2/other.h": "",
|
||||
},
|
||||
Blueprint: `
|
||||
cc_prebuilt_library_static {
|
||||
name: "libtest",
|
||||
srcs: ["libf.so"],
|
||||
export_include_dirs: ["testdir/1/"],
|
||||
export_system_include_dirs: ["testdir/2/"],
|
||||
bazel_module: { bp2build_available: true },
|
||||
}`,
|
||||
ExpectedBazelTargets: []string{
|
||||
MakeBazelTarget("cc_prebuilt_library_static", "libtest", AttrNameToString{
|
||||
"static_library": `"libf.so"`,
|
||||
"export_includes": `["testdir/1/"]`,
|
||||
"export_system_includes": `["testdir/2/"]`,
|
||||
}),
|
||||
MakeBazelTarget("cc_prebuilt_library_static", "libtest_alwayslink", AttrNameToString{
|
||||
"static_library": `"libf.so"`,
|
||||
"export_includes": `["testdir/1/"]`,
|
||||
"export_system_includes": `["testdir/2/"]`,
|
||||
"alwayslink": "True",
|
||||
}),
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func TestPrebuiltLibraryStaticWithExportIncludesArchVariant(t *testing.T) {
|
||||
runCcPrebuiltLibraryStaticTestCase(t, Bp2buildTestCase{
|
||||
Description: "cc_prebuilt_library_static correctly translates export_includes with arch variance",
|
||||
Filesystem: map[string]string{
|
||||
"libf.so": "",
|
||||
"libg.so": "",
|
||||
},
|
||||
Blueprint: `
|
||||
cc_prebuilt_library_static {
|
||||
name: "libtest",
|
||||
srcs: ["libf.so"],
|
||||
arch: {
|
||||
arm: { export_include_dirs: ["testdir/1/"], },
|
||||
arm64: { export_include_dirs: ["testdir/2/"], },
|
||||
},
|
||||
bazel_module: { bp2build_available: true },
|
||||
}`,
|
||||
ExpectedBazelTargets: []string{
|
||||
MakeBazelTarget("cc_prebuilt_library_static", "libtest", AttrNameToString{
|
||||
"static_library": `"libf.so"`,
|
||||
"export_includes": `select({
|
||||
"//build/bazel/platforms/arch:arm": ["testdir/1/"],
|
||||
"//build/bazel/platforms/arch:arm64": ["testdir/2/"],
|
||||
"//conditions:default": [],
|
||||
})`,
|
||||
}),
|
||||
MakeBazelTarget("cc_prebuilt_library_static", "libtest_alwayslink", AttrNameToString{
|
||||
"alwayslink": "True",
|
||||
"static_library": `"libf.so"`,
|
||||
"export_includes": `select({
|
||||
"//build/bazel/platforms/arch:arm": ["testdir/1/"],
|
||||
"//build/bazel/platforms/arch:arm64": ["testdir/2/"],
|
||||
"//conditions:default": [],
|
||||
})`,
|
||||
}),
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func TestPrebuiltLibraryStaticWithExportSystemIncludesArchVariant(t *testing.T) {
|
||||
runCcPrebuiltLibraryStaticTestCase(t, Bp2buildTestCase{
|
||||
Description: "cc_prebuilt_library_static correctly translates export_system_includes with arch variance",
|
||||
Filesystem: map[string]string{
|
||||
"libf.so": "",
|
||||
"libg.so": "",
|
||||
},
|
||||
Blueprint: `
|
||||
cc_prebuilt_library_static {
|
||||
name: "libtest",
|
||||
srcs: ["libf.so"],
|
||||
arch: {
|
||||
arm: { export_system_include_dirs: ["testdir/1/"], },
|
||||
arm64: { export_system_include_dirs: ["testdir/2/"], },
|
||||
},
|
||||
bazel_module: { bp2build_available: true },
|
||||
}`,
|
||||
ExpectedBazelTargets: []string{
|
||||
MakeBazelTarget("cc_prebuilt_library_static", "libtest", AttrNameToString{
|
||||
"static_library": `"libf.so"`,
|
||||
"export_system_includes": `select({
|
||||
"//build/bazel/platforms/arch:arm": ["testdir/1/"],
|
||||
"//build/bazel/platforms/arch:arm64": ["testdir/2/"],
|
||||
"//conditions:default": [],
|
||||
})`,
|
||||
}),
|
||||
MakeBazelTarget("cc_prebuilt_library_static", "libtest_alwayslink", AttrNameToString{
|
||||
"alwayslink": "True",
|
||||
"static_library": `"libf.so"`,
|
||||
"export_system_includes": `select({
|
||||
"//build/bazel/platforms/arch:arm": ["testdir/1/"],
|
||||
"//build/bazel/platforms/arch:arm64": ["testdir/2/"],
|
||||
"//conditions:default": [],
|
||||
})`,
|
||||
}),
|
||||
},
|
||||
})
|
||||
}
|
||||
Reference in New Issue
Block a user