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

Commit 7db88279 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "aidl_interface_hdrs" into main 

* changes:
  export SimpleModuleDoNotConvertBp2build for AIDL
  export SetStubsForDynamicDeps for use in AIDL
parents fc7ba26f 130d75b6

bp2build/aar_conversion_test.go

+4 −4
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ func TestConvertAndroidLibrary(t *testing.T) { 
			"res/res.png":                  "",

			"manifest/AndroidManifest.xml": "",

		},

		Blueprint: simpleModuleDoNotConvertBp2build("android_library", "static_lib_dep") + `

		Blueprint: SimpleModuleDoNotConvertBp2build("android_library", "static_lib_dep") + `

android_library {

	name: "TestLib",

	srcs: ["lib.java"],
@@ -82,7 +82,7 @@ func TestConvertAndroidLibraryWithNoSources(t *testing.T) { 
			"res/res.png":         "",

			"AndroidManifest.xml": "",

		},

		Blueprint: simpleModuleDoNotConvertBp2build("android_library", "lib_dep") + `

		Blueprint: SimpleModuleDoNotConvertBp2build("android_library", "lib_dep") + `

android_library {

	name: "TestLib",

	srcs: [],
@@ -113,8 +113,8 @@ func TestConvertAndroidLibraryImport(t *testing.T) { 
			// Bazel's aar_import can only export *_import targets, so we expect

			// only "static_import_dep" in exports, but both "static_lib_dep" and

			// "static_import_dep" in deps

			Blueprint: simpleModuleDoNotConvertBp2build("android_library", "static_lib_dep") +

				simpleModuleDoNotConvertBp2build("android_library_import", "static_import_dep") + `

			Blueprint: SimpleModuleDoNotConvertBp2build("android_library", "static_lib_dep") +

				SimpleModuleDoNotConvertBp2build("android_library_import", "static_import_dep") + `

android_library_import {

        name: "TestImport",

        aars: ["import.aar"],

bp2build/android_app_conversion_test.go

+5 −5
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ func TestAndroidAppAllSupportedFields(t *testing.T) { 
			"manifest/AndroidManifest.xml": "",

			"assets_/asset.png":            "",

		},

		Blueprint: simpleModuleDoNotConvertBp2build("android_app", "static_lib_dep") + `

		Blueprint: SimpleModuleDoNotConvertBp2build("android_app", "static_lib_dep") + `

android_app {

	name: "TestApp",

	srcs: ["app.java"],
@@ -177,7 +177,7 @@ func TestAndroidAppCertIsModule(t *testing.T) { 
		ModuleTypeUnderTest:        "android_app",

		ModuleTypeUnderTestFactory: java.AndroidAppFactory,

		Filesystem:                 map[string]string{},

		Blueprint: simpleModuleDoNotConvertBp2build("filegroup", "foocert") + `

		Blueprint: SimpleModuleDoNotConvertBp2build("filegroup", "foocert") + `

android_app {

	name: "TestApp",

	certificate: ":foocert",
@@ -262,7 +262,7 @@ func TestAndroidAppLibs(t *testing.T) { 
		ModuleTypeUnderTest:        "android_app",

		ModuleTypeUnderTestFactory: java.AndroidAppFactory,

		Filesystem:                 map[string]string{},

		Blueprint: simpleModuleDoNotConvertBp2build("java_library", "barLib") + `

		Blueprint: SimpleModuleDoNotConvertBp2build("java_library", "barLib") + `

android_app {

	name: "foo",

	libs: ["barLib"],
@@ -291,8 +291,8 @@ func TestAndroidAppKotlinSrcs(t *testing.T) { 
		Filesystem: map[string]string{

			"res/res.png": "",

		},

		Blueprint: simpleModuleDoNotConvertBp2build("filegroup", "foocert") +

			simpleModuleDoNotConvertBp2build("java_library", "barLib") + `

		Blueprint: SimpleModuleDoNotConvertBp2build("filegroup", "foocert") +

			SimpleModuleDoNotConvertBp2build("java_library", "barLib") + `

android_app {

	name: "foo",

	srcs: ["a.java", "b.kt"],

bp2build/apex_conversion_test.go

+3 −3
Original line number Diff line number Diff line
@@ -1263,7 +1263,7 @@ apex { 
	file_contexts: ":com.android.apogee-file_contexts",

	certificate: ":com.android.apogee.certificate",

}

` + simpleModuleDoNotConvertBp2build("filegroup", "com.android.apogee-file_contexts"),

` + SimpleModuleDoNotConvertBp2build("filegroup", "com.android.apogee-file_contexts"),

		ExpectedBazelTargets: []string{

			MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{

				"certificate":   `":com.android.apogee.certificate"`,
@@ -1299,7 +1299,7 @@ apex { 
	binaries: ["bar"],

	native_shared_libs: ["foo"],

}

` + simpleModuleDoNotConvertBp2build("filegroup", "myapex-file_contexts"),

` + SimpleModuleDoNotConvertBp2build("filegroup", "myapex-file_contexts"),

		ExpectedBazelTargets: []string{

			MakeBazelTarget("cc_binary", "bar", AttrNameToString{

				"local_includes": `["."]`,
@@ -1356,7 +1356,7 @@ apex { 
	file_contexts: ":com.android.apogee-file_contexts",

	certificate: "com.android.apogee.certificate",

}

` + simpleModuleDoNotConvertBp2build("filegroup", "com.android.apogee-file_contexts"),

` + SimpleModuleDoNotConvertBp2build("filegroup", "com.android.apogee-file_contexts"),

		ExpectedBazelTargets: []string{

			MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{

				"certificate_name": `"com.android.apogee.certificate"`,

bp2build/apex_key_conversion_test.go

+2 −2
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ apex_key { 
        public_key: ":com.android.apogee.avbpubkey",

        private_key: ":com.android.apogee.pem",

}

` + simpleModuleDoNotConvertBp2build("filegroup", "com.android.apogee.avbpubkey") +

			simpleModuleDoNotConvertBp2build("filegroup", "com.android.apogee.pem"),

` + SimpleModuleDoNotConvertBp2build("filegroup", "com.android.apogee.avbpubkey") +

			SimpleModuleDoNotConvertBp2build("filegroup", "com.android.apogee.pem"),

		ExpectedBazelTargets: []string{MakeBazelTargetNoRestrictions("apex_key", "com.android.apogee.key", AttrNameToString{

			"private_key":            `":com.android.apogee.pem"`,

			"public_key":             `":com.android.apogee.avbpubkey"`,

bp2build/build_conversion_test.go

+6 −6
Original line number Diff line number Diff line
@@ -1743,7 +1743,7 @@ func TestCommonBp2BuildModuleAttrs(t *testing.T) { 
			Description:                "Required into data test",

			ModuleTypeUnderTest:        "filegroup",

			ModuleTypeUnderTestFactory: android.FileGroupFactory,

			Blueprint: simpleModuleDoNotConvertBp2build("filegroup", "reqd") + `

			Blueprint: SimpleModuleDoNotConvertBp2build("filegroup", "reqd") + `

filegroup {

    name: "fg_foo",

    required: ["reqd"],
@@ -1759,7 +1759,7 @@ filegroup { 
			Description:                "Required into data test, cyclic self reference is filtered out",

			ModuleTypeUnderTest:        "filegroup",

			ModuleTypeUnderTestFactory: android.FileGroupFactory,

			Blueprint: simpleModuleDoNotConvertBp2build("filegroup", "reqd") + `

			Blueprint: SimpleModuleDoNotConvertBp2build("filegroup", "reqd") + `

filegroup {

    name: "fg_foo",

    required: ["reqd", "fg_foo"],
@@ -1775,8 +1775,8 @@ filegroup { 
			Description:                "Required via arch into data test",

			ModuleTypeUnderTest:        "python_library",

			ModuleTypeUnderTestFactory: python.PythonLibraryFactory,

			Blueprint: simpleModuleDoNotConvertBp2build("python_library", "reqdx86") +

				simpleModuleDoNotConvertBp2build("python_library", "reqdarm") + `

			Blueprint: SimpleModuleDoNotConvertBp2build("python_library", "reqdx86") +

				SimpleModuleDoNotConvertBp2build("python_library", "reqdarm") + `

python_library {

    name: "fg_foo",

    arch: {
@@ -1809,7 +1809,7 @@ python_library { 
				"data.bin": "",

				"src.py":   "",

			},

			Blueprint: simpleModuleDoNotConvertBp2build("python_library", "reqd") + `

			Blueprint: SimpleModuleDoNotConvertBp2build("python_library", "reqd") + `

python_library {

    name: "fg_foo",

    data: ["data.bin"],
@@ -1831,7 +1831,7 @@ python_library { 
			Description:                "All props-to-attrs at once together test",

			ModuleTypeUnderTest:        "filegroup",

			ModuleTypeUnderTestFactory: android.FileGroupFactory,

			Blueprint: simpleModuleDoNotConvertBp2build("filegroup", "reqd") + `

			Blueprint: SimpleModuleDoNotConvertBp2build("filegroup", "reqd") + `

filegroup {

    name: "fg_foo",

    required: ["reqd"],