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

Commit 37ed5063 authored by Inseob Kim's avatar Inseob Kim Committed by Gerrit Code Review
Browse files

Merge changes I059e639b,I4ebe1da8,Idf4fd37a,Id90082b5 

* changes:
  Do not disable llndk libraries
  Create only one vendor variant depending on path
  Implement cc_object vendor snapshot
  Refine logic choosing vendor snapshot modules
parents 575c610b 206665cc

cc/androidmk.go

+19 −0
Original line number Diff line number Diff line
@@ -548,6 +548,25 @@ func (c *vendorSnapshotBinaryDecorator) AndroidMkEntries(ctx AndroidMkContext, e 
	})

}



func (c *vendorSnapshotObjectLinker) AndroidMkEntries(ctx AndroidMkContext, entries *android.AndroidMkEntries) {

	entries.Class = "STATIC_LIBRARIES"



	if c.androidMkVendorSuffix {

		entries.SubName = vendorSuffix

	} else {

		entries.SubName = ""

	}



	entries.ExtraFooters = append(entries.ExtraFooters,

		func(w io.Writer, name, prefix, moduleDir string, entries *android.AndroidMkEntries) {

			out := entries.OutputFile.Path()

			varname := fmt.Sprintf("SOONG_%sOBJECT_%s%s", prefix, name, entries.SubName)



			fmt.Fprintf(w, "\n%s := %s\n", varname, out.String())

			fmt.Fprintln(w, ".KATI_READONLY: "+varname)

		})

}



func (c *ndkPrebuiltStlLinker) AndroidMkEntries(ctx AndroidMkContext, entries *android.AndroidMkEntries) {

	entries.Class = "SHARED_LIBRARIES"

}

cc/binary.go

+4 −0
Original line number Diff line number Diff line
@@ -231,6 +231,10 @@ func (binary *binaryDecorator) staticBinary() bool { 
	return binary.static()

}



func (binary *binaryDecorator) binary() bool {

	return true

}



func (binary *binaryDecorator) linkerFlags(ctx ModuleContext, flags Flags) Flags {

	flags = binary.baseLinker.linkerFlags(ctx, flags)

cc/cc.go

+55 −19
Original line number Diff line number Diff line
@@ -316,6 +316,8 @@ type ModuleContextIntf interface { 
	static() bool

	staticBinary() bool

	header() bool

	binary() bool

	object() bool

	toolchain() config.Toolchain

	canUseSdk() bool

	useSdk() bool
@@ -1017,14 +1019,8 @@ func (c *Module) nativeCoverage() bool { 
}



func (c *Module) isSnapshotPrebuilt() bool {

	if _, ok := c.linker.(*vndkPrebuiltLibraryDecorator); ok {

		return true

	}

	if _, ok := c.linker.(*vendorSnapshotLibraryDecorator); ok {

		return true

	}

	if _, ok := c.linker.(*vendorSnapshotBinaryDecorator); ok {

		return true

	if p, ok := c.linker.(interface{ isSnapshotPrebuilt() bool }); ok {

		return p.isSnapshotPrebuilt()

	}

	return false

}
@@ -1129,6 +1125,14 @@ func (ctx *moduleContextImpl) header() bool { 
	return ctx.mod.header()

}



func (ctx *moduleContextImpl) binary() bool {

	return ctx.mod.binary()

}



func (ctx *moduleContextImpl) object() bool {

	return ctx.mod.object()

}



func (ctx *moduleContextImpl) canUseSdk() bool {

	return ctx.mod.canUseSdk()

}
@@ -1925,7 +1929,7 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) { 
	if deps.StaticUnwinderIfLegacy {

		actx.AddVariationDependencies([]blueprint.Variation{

			{Mutator: "link", Variation: "static"},

		}, staticUnwinderDepTag, staticUnwinder(actx))

		}, staticUnwinderDepTag, rewriteSnapshotLibs(staticUnwinder(actx), vendorSnapshotStaticLibs))

	}



	for _, lib := range deps.LateStaticLibs {
@@ -2006,11 +2010,13 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) { 


	actx.AddVariationDependencies(nil, objDepTag, deps.ObjFiles...)



	vendorSnapshotObjects := vendorSnapshotObjects(actx.Config())



	if deps.CrtBegin != "" {

		actx.AddVariationDependencies(nil, CrtBeginDepTag, deps.CrtBegin)

		actx.AddVariationDependencies(nil, CrtBeginDepTag, rewriteSnapshotLibs(deps.CrtBegin, vendorSnapshotObjects))

	}

	if deps.CrtEnd != "" {

		actx.AddVariationDependencies(nil, CrtEndDepTag, deps.CrtEnd)

		actx.AddVariationDependencies(nil, CrtEndDepTag, rewriteSnapshotLibs(deps.CrtEnd, vendorSnapshotObjects))

	}

	if deps.LinkerFlagsFile != "" {

		actx.AddDependency(c, linkerFlagsDepTag, deps.LinkerFlagsFile)
@@ -2752,6 +2758,24 @@ func (c *Module) header() bool { 
	return false

}



func (c *Module) binary() bool {

	if b, ok := c.linker.(interface {

		binary() bool

	}); ok {

		return b.binary()

	}

	return false

}



func (c *Module) object() bool {

	if o, ok := c.linker.(interface {

		object() bool

	}); ok {

		return o.object()

	}

	return false

}



func (c *Module) getMakeLinkType(actx android.ModuleContext) string {

	if c.UseVndk() {

		if lib, ok := c.linker.(*llndkStubDecorator); ok {
@@ -3064,20 +3088,32 @@ func (m *Module) ImageMutatorBegin(mctx android.BaseModuleContext) { 
		// This will be available in /system, /vendor and /product

		// or a /system directory that is available to vendor and product.

		coreVariantNeeded = true



		// We assume that modules under proprietary paths are compatible for

		// BOARD_VNDK_VERSION. The other modules are regarded as AOSP, or

		// PLATFORM_VNDK_VERSION.

		if isVendorProprietaryPath(mctx.ModuleDir()) {

			vendorVariants = append(vendorVariants, boardVndkVersion)

		} else {

			vendorVariants = append(vendorVariants, platformVndkVersion)

		productVariants = append(productVariants, platformVndkVersion)

		// VNDK modules must not create BOARD_VNDK_VERSION variant because its

		// code is PLATFORM_VNDK_VERSION.

		// On the other hand, vendor_available modules which are not VNDK should

		// also build BOARD_VNDK_VERSION because it's installed in /vendor.

		}



		// vendor_available modules are also available to /product.

		productVariants = append(productVariants, platformVndkVersion)

		// VNDK is always PLATFORM_VNDK_VERSION

		if !m.IsVndk() {

			vendorVariants = append(vendorVariants, boardVndkVersion)

			productVariants = append(productVariants, productVndkVersion)

		}

	} else if vendorSpecific && String(m.Properties.Sdk_version) == "" {

		// This will be available in /vendor (or /odm) only

		// We assume that modules under proprietary paths are compatible for

		// BOARD_VNDK_VERSION. The other modules are regarded as AOSP, or

		// PLATFORM_VNDK_VERSION.

		if isVendorProprietaryPath(mctx.ModuleDir()) {

			vendorVariants = append(vendorVariants, boardVndkVersion)

		} else {

			vendorVariants = append(vendorVariants, platformVndkVersion)

		}

	} else {

		// This is either in /system (or similar: /data), or is a

		// modules built with the NDK. Modules built with the NDK

cc/cc_test.go

+64 −21
Original line number Diff line number Diff line
@@ -258,9 +258,7 @@ func checkVndkModule(t *testing.T, ctx *android.TestContext, name, subDir string 
	}

}



func checkSnapshot(t *testing.T, ctx *android.TestContext, singletonName, moduleName, snapshotFilename, subDir, variant string) {

	snapshotSingleton := ctx.SingletonForTests(singletonName)



func checkSnapshot(t *testing.T, ctx *android.TestContext, singleton android.TestingSingleton, moduleName, snapshotFilename, subDir, variant string) {

	mod, ok := ctx.ModuleForTests(moduleName, variant).Module().(android.OutputFileProducer)

	if !ok {

		t.Errorf("%q must have output\n", moduleName)
@@ -273,7 +271,7 @@ func checkSnapshot(t *testing.T, ctx *android.TestContext, singletonName, module 
	}

	snapshotPath := filepath.Join(subDir, snapshotFilename)



	out := snapshotSingleton.Output(snapshotPath)

	out := singleton.Output(snapshotPath)

	if out.Input.String() != outputFiles[0].String() {

		t.Errorf("The input of snapshot %q must be %q, but %q", moduleName, out.Input.String(), outputFiles[0])

	}
@@ -398,16 +396,18 @@ func TestVndk(t *testing.T) { 
	variant := "android_vendor.VER_arm64_armv8-a_shared"

	variant2nd := "android_vendor.VER_arm_armv7-a-neon_shared"



	checkSnapshot(t, ctx, "vndk-snapshot", "libvndk", "libvndk.so", vndkCoreLibPath, variant)

	checkSnapshot(t, ctx, "vndk-snapshot", "libvndk", "libvndk.so", vndkCoreLib2ndPath, variant2nd)

	checkSnapshot(t, ctx, "vndk-snapshot", "libvndk_sp", "libvndk_sp-x.so", vndkSpLibPath, variant)

	checkSnapshot(t, ctx, "vndk-snapshot", "libvndk_sp", "libvndk_sp-x.so", vndkSpLib2ndPath, variant2nd)

	snapshotSingleton := ctx.SingletonForTests("vndk-snapshot")



	checkSnapshot(t, ctx, snapshotSingleton, "libvndk", "libvndk.so", vndkCoreLibPath, variant)

	checkSnapshot(t, ctx, snapshotSingleton, "libvndk", "libvndk.so", vndkCoreLib2ndPath, variant2nd)

	checkSnapshot(t, ctx, snapshotSingleton, "libvndk_sp", "libvndk_sp-x.so", vndkSpLibPath, variant)

	checkSnapshot(t, ctx, snapshotSingleton, "libvndk_sp", "libvndk_sp-x.so", vndkSpLib2ndPath, variant2nd)



	snapshotConfigsPath := filepath.Join(snapshotVariantPath, "configs")

	checkSnapshot(t, ctx, "vndk-snapshot", "llndk.libraries.txt", "llndk.libraries.txt", snapshotConfigsPath, "")

	checkSnapshot(t, ctx, "vndk-snapshot", "vndkcore.libraries.txt", "vndkcore.libraries.txt", snapshotConfigsPath, "")

	checkSnapshot(t, ctx, "vndk-snapshot", "vndksp.libraries.txt", "vndksp.libraries.txt", snapshotConfigsPath, "")

	checkSnapshot(t, ctx, "vndk-snapshot", "vndkprivate.libraries.txt", "vndkprivate.libraries.txt", snapshotConfigsPath, "")

	checkSnapshot(t, ctx, snapshotSingleton, "llndk.libraries.txt", "llndk.libraries.txt", snapshotConfigsPath, "")

	checkSnapshot(t, ctx, snapshotSingleton, "vndkcore.libraries.txt", "vndkcore.libraries.txt", snapshotConfigsPath, "")

	checkSnapshot(t, ctx, snapshotSingleton, "vndksp.libraries.txt", "vndksp.libraries.txt", snapshotConfigsPath, "")

	checkSnapshot(t, ctx, snapshotSingleton, "vndkprivate.libraries.txt", "vndkprivate.libraries.txt", snapshotConfigsPath, "")



	checkVndkOutput(t, ctx, "vndk/vndk.libraries.txt", []string{

		"LLNDK: libc.so",
@@ -839,6 +839,17 @@ func TestVendorSnapshot(t *testing.T) { 
		vendor_available: true,

		nocrt: true,

	}



	toolchain_library {

		name: "libb",

		vendor_available: true,

		src: "libb.a",

	}



	cc_object {

		name: "obj",

		vendor_available: true,

	}

`

	config := TestConfig(buildDir, android.Android, nil, bp, nil)

	config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
@@ -849,6 +860,9 @@ func TestVendorSnapshot(t *testing.T) { 


	snapshotDir := "vendor-snapshot"

	snapshotVariantPath := filepath.Join(buildDir, snapshotDir, "arm64")

	snapshotSingleton := ctx.SingletonForTests("vendor-snapshot")



	var jsonFiles []string



	for _, arch := range [][]string{

		[]string{"arm64", "armv8-a"},
@@ -861,22 +875,51 @@ func TestVendorSnapshot(t *testing.T) { 
		// For shared libraries, only non-VNDK vendor_available modules are captured

		sharedVariant := fmt.Sprintf("android_vendor.VER_%s_%s_shared", archType, archVariant)

		sharedDir := filepath.Join(snapshotVariantPath, archDir, "shared")

		checkSnapshot(t, ctx, "vendor-snapshot", "libvendor", "libvendor.so", sharedDir, sharedVariant)

		checkSnapshot(t, ctx, "vendor-snapshot", "libvendor_available", "libvendor_available.so", sharedDir, sharedVariant)

		checkSnapshot(t, ctx, snapshotSingleton, "libvendor", "libvendor.so", sharedDir, sharedVariant)

		checkSnapshot(t, ctx, snapshotSingleton, "libvendor_available", "libvendor_available.so", sharedDir, sharedVariant)

		jsonFiles = append(jsonFiles,

			filepath.Join(sharedDir, "libvendor.so.json"),

			filepath.Join(sharedDir, "libvendor_available.so.json"))



		// For static libraries, all vendor:true and vendor_available modules (including VNDK) are captured.

		staticVariant := fmt.Sprintf("android_vendor.VER_%s_%s_static", archType, archVariant)

		staticDir := filepath.Join(snapshotVariantPath, archDir, "static")

		checkSnapshot(t, ctx, "vendor-snapshot", "libvndk", "libvndk.a", staticDir, staticVariant)

		checkSnapshot(t, ctx, "vendor-snapshot", "libvendor", "libvendor.a", staticDir, staticVariant)

		checkSnapshot(t, ctx, "vendor-snapshot", "libvendor_available", "libvendor_available.a", staticDir, staticVariant)



		// For binary libraries, all vendor:true and vendor_available modules are captured.

		checkSnapshot(t, ctx, snapshotSingleton, "libb", "libb.a", staticDir, staticVariant)

		checkSnapshot(t, ctx, snapshotSingleton, "libvndk", "libvndk.a", staticDir, staticVariant)

		checkSnapshot(t, ctx, snapshotSingleton, "libvendor", "libvendor.a", staticDir, staticVariant)

		checkSnapshot(t, ctx, snapshotSingleton, "libvendor_available", "libvendor_available.a", staticDir, staticVariant)

		jsonFiles = append(jsonFiles,

			filepath.Join(staticDir, "libb.a.json"),

			filepath.Join(staticDir, "libvndk.a.json"),

			filepath.Join(staticDir, "libvendor.a.json"),

			filepath.Join(staticDir, "libvendor_available.a.json"))



		// For binary executables, all vendor:true and vendor_available modules are captured.

		if archType == "arm64" {

			binaryVariant := fmt.Sprintf("android_vendor.VER_%s_%s", archType, archVariant)

			binaryDir := filepath.Join(snapshotVariantPath, archDir, "binary")

			checkSnapshot(t, ctx, "vendor-snapshot", "vendor_bin", "vendor_bin", binaryDir, binaryVariant)

			checkSnapshot(t, ctx, "vendor-snapshot", "vendor_available_bin", "vendor_available_bin", binaryDir, binaryVariant)

			checkSnapshot(t, ctx, snapshotSingleton, "vendor_bin", "vendor_bin", binaryDir, binaryVariant)

			checkSnapshot(t, ctx, snapshotSingleton, "vendor_available_bin", "vendor_available_bin", binaryDir, binaryVariant)

			jsonFiles = append(jsonFiles,

				filepath.Join(binaryDir, "vendor_bin.json"),

				filepath.Join(binaryDir, "vendor_available_bin.json"))

		}



		// For header libraries, all vendor:true and vendor_available modules are captured.

		headerDir := filepath.Join(snapshotVariantPath, archDir, "header")

		jsonFiles = append(jsonFiles, filepath.Join(headerDir, "libvendor_headers.json"))



		// For object modules, all vendor:true and vendor_available modules are captured.

		objectVariant := fmt.Sprintf("android_vendor.VER_%s_%s", archType, archVariant)

		objectDir := filepath.Join(snapshotVariantPath, archDir, "object")

		checkSnapshot(t, ctx, snapshotSingleton, "obj", "obj.o", objectDir, objectVariant)

		jsonFiles = append(jsonFiles, filepath.Join(objectDir, "obj.o.json"))

	}



	for _, jsonFile := range jsonFiles {

		// verify all json files exist

		if snapshotSingleton.MaybeOutput(jsonFile).Rule == nil {

			t.Errorf("%q expected but not found", jsonFile)

		}

	}

}

cc/genrule.go

+8 −2
Original line number Diff line number Diff line
@@ -79,8 +79,14 @@ func (g *GenruleExtraProperties) ExtraImageVariations(ctx android.BaseModuleCont 


	var variants []string

	if Bool(g.Vendor_available) || ctx.SocSpecific() || ctx.DeviceSpecific() {

		vndkVersion := ctx.DeviceConfig().VndkVersion()

		// If vndkVersion is current, we can always use PlatformVndkVersion.

		// If not, we assume modules under proprietary paths are compatible for

		// BOARD_VNDK_VERSION. The other modules are regarded as AOSP, that is

		// PLATFORM_VNDK_VERSION.

		if vndkVersion == "current" || !isVendorProprietaryPath(ctx.ModuleDir()) {

			variants = append(variants, VendorVariationPrefix+ctx.DeviceConfig().PlatformVndkVersion())

		if vndkVersion := ctx.DeviceConfig().VndkVersion(); vndkVersion != "current" {

		} else {

			variants = append(variants, VendorVariationPrefix+vndkVersion)

		}

	}