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

Commit 85707de8 authored by Jooyung Han's avatar Jooyung Han
Browse files

Add cc_library.target.vendor.no_stubs 

This is to handle libz special case. libz has stubs but not an LLNDK.
So, libz.vendor should be treated as non-stub-providing libraries and
Vendor APEX should bundle it if it's used by its contents.

libz will set no_stubs for vendor/product variants.

Bug: 313806237
Test: go tests ./apex/...
Change-Id: I10759d7073838909126f8bfe87654f11aa02fd32
parent 198583ed

apex/apex_test.go

+66 −0
Original line number Diff line number Diff line
@@ -4705,6 +4705,72 @@ func TestTestApex(t *testing.T) { 
	ensureListContains(t, ctx.ModuleVariantsForTests("mylib_common_test"), "android_arm64_armv8-a_shared")

}



func TestLibzVendorIsntStable(t *testing.T) {

	ctx := testApex(t, `

	apex {

		name: "myapex",

		key: "myapex.key",

		updatable: false,

		binaries: ["mybin"],

	}

	apex {

		name: "myvendorapex",

		key: "myapex.key",

		file_contexts: "myvendorapex_file_contexts",

		vendor: true,

		updatable: false,

		binaries: ["mybin"],

	}

	apex_key {

		name: "myapex.key",

		public_key: "testkey.avbpubkey",

		private_key: "testkey.pem",

	}

	cc_binary {

		name: "mybin",

		vendor_available: true,

		system_shared_libs: [],

		stl: "none",

		shared_libs: ["libz"],

		apex_available: ["//apex_available:anyapex"],

	}

	cc_library {

		name: "libz",

		vendor_available: true,

		system_shared_libs: [],

		stl: "none",

		stubs: {

			versions: ["28", "30"],

		},

		target: {

			vendor: {

				no_stubs: true,

			},

		},

	}

	`, withFiles(map[string][]byte{

		"myvendorapex_file_contexts": nil,

	}))



	// libz provides stubs for core variant.

	{

		ensureExactContents(t, ctx, "myapex", "android_common_myapex", []string{

			"bin/mybin",

		})

		apexManifestRule := ctx.ModuleForTests("myapex", "android_common_myapex").Rule("apexManifestRule")

		android.AssertStringEquals(t, "should require libz", apexManifestRule.Args["requireNativeLibs"], "libz.so")

	}

	// libz doesn't provide stubs for vendor variant.

	{

		ensureExactContents(t, ctx, "myvendorapex", "android_common_myvendorapex", []string{

			"bin/mybin",

			"lib64/libz.so",

		})

		apexManifestRule := ctx.ModuleForTests("myvendorapex", "android_common_myvendorapex").Rule("apexManifestRule")

		android.AssertStringEquals(t, "should not require libz", apexManifestRule.Args["requireNativeLibs"], "")

	}

}



func TestApexWithTarget(t *testing.T) {

	ctx := testApex(t, `

		apex {

cc/image.go

+10 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import ( 


	"android/soong/android"

	"android/soong/snapshot"



	"github.com/google/blueprint/proptools"

)



var _ android.ImageInterface = (*Module)(nil)
@@ -622,6 +624,10 @@ func squashVendorSrcs(m *Module) { 


		lib.baseCompiler.Properties.Exclude_generated_sources = append(lib.baseCompiler.Properties.Exclude_generated_sources,

			lib.baseCompiler.Properties.Target.Vendor.Exclude_generated_sources...)



		if lib.Properties.Target.Vendor.No_stubs {

			proptools.Clear(&lib.Properties.Stubs)

		}

	}

}
@@ -635,6 +641,10 @@ func squashProductSrcs(m *Module) { 


		lib.baseCompiler.Properties.Exclude_generated_sources = append(lib.baseCompiler.Properties.Exclude_generated_sources,

			lib.baseCompiler.Properties.Target.Product.Exclude_generated_sources...)



		if lib.Properties.Target.Product.No_stubs {

			proptools.Clear(&lib.Properties.Stubs)

		}

	}

}

cc/library.go

+7 −0
Original line number Diff line number Diff line
@@ -107,6 +107,13 @@ type LibraryProperties struct { 
			Suffix *string `android:"arch_variant"`



			Header_abi_checker headerAbiCheckerProperties



			// Disable stubs for vendor/product variants

			// This is a workaround to keep `stubs` only for "core" variant (not product/vendor).

			// It would be nice if we could put `stubs` into a `target: { core: {} }`

			// block but it's not supported in soong yet. This could be removed/simplified once we have

			// a better syntax.

			No_stubs bool

		}



		Platform struct {