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

Commit c77c6141 authored by Jingwen Chen's avatar Jingwen Chen Committed by Automerger Merge Worker
Browse files

Merge "Fix apex bp2build." am: 8bdc1bb3 am: d3f17aed am: 5c2e2525 am: dc597c67 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1769290

Change-Id: Ifaadee6af1a4802c8beab9322277ddd17e596f3a
parents 20ee3abb dc597c67

android/bazel.go

+5 −4
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ var ( 
	// Keep any existing BUILD files (and do not generate new BUILD files) for these directories

	bp2buildKeepExistingBuildFile = map[string]bool{

		// This is actually build/bazel/build.BAZEL symlinked to ./BUILD

		".":/*recrusive = */ false,

		".":/*recursive = */ false,



		"build/bazel":/* recursive = */ true,

		"build/pesto":/* recursive = */ true,
@@ -145,6 +145,7 @@ var ( 
	// Configure modules in these directories to enable bp2build_available: true or false by default.

	bp2buildDefaultConfig = Bp2BuildConfig{

		"bionic":                            Bp2BuildDefaultTrueRecursively,

		"build/bazel/examples/apex/minimal": Bp2BuildDefaultTrueRecursively,

		"external/gwp_asan":                 Bp2BuildDefaultTrueRecursively,

		"system/core/libcutils":             Bp2BuildDefaultTrueRecursively,

		"system/core/property_service/libpropertyinfoparser": Bp2BuildDefaultTrueRecursively,

apex/apex.go

+1 −0
Original line number Diff line number Diff line
@@ -2187,6 +2187,7 @@ func newApexBundle() *apexBundle { 
	android.InitDefaultableModule(module)

	android.InitSdkAwareModule(module)

	android.InitOverridableModule(module, &module.overridableProperties.Overrides)

	android.InitBazelModule(module)

	return module

}

bp2build/apex_conversion_test.go

+20 −0
Original line number Diff line number Diff line
@@ -46,3 +46,23 @@ apex { 
    manifest = "manifest.json",

)`}})

}



func TestApexBundleHasBazelModuleProps(t *testing.T) {

	runApexTestCase(t, bp2buildTestCase{

		description:                        "apex - has bazel module props",

		moduleTypeUnderTest:                "apex",

		moduleTypeUnderTestFactory:         apex.BundleFactory,

		moduleTypeUnderTestBp2BuildMutator: apex.ApexBundleBp2Build,

		filesystem:                         map[string]string{},

		blueprint: `

apex {

	name: "apogee",

	manifest: "manifest.json",

	bazel_module: { bp2build_available: true },

}

`,

		expectedBazelTargets: []string{`apex(

    name = "apogee",

    manifest = "manifest.json",

)`}})

}