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

Commit 8d4a1f03 authored by Jooyung Han's avatar Jooyung Han
Browse files

apex: Remove host support 

Since we no longer support "zip" APEX, we don't need "host" support.

For example, we don't need go/python binary support.

Bug: 279835185
Test: m
Change-Id: I6e8d2b205e42662f31866dc9ac7507524effd144
parent a0503a51

apex/androidmk.go

+4 −27
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ func (class apexFileClass) nameInMake() string { 
		return "ETC"

	case nativeSharedLib:

		return "SHARED_LIBRARIES"

	case nativeExecutable, shBinary, pyBinary, goBinary:

	case nativeExecutable, shBinary:

		return "EXECUTABLES"

	case javaSharedLib:

		return "JAVA_LIBRARIES"
@@ -135,33 +135,10 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, moduleDir st 
		fmt.Fprintln(w, "LOCAL_MODULE_CLASS :=", fi.class.nameInMake())

		if fi.module != nil {

			// This apexFile's module comes from Soong

			archStr := fi.module.Target().Arch.ArchType.String()

			host := false

			switch fi.module.Target().Os.Class {

			case android.Host:

				if fi.module.Target().HostCross {

					if fi.module.Target().Arch.ArchType != android.Common {

						fmt.Fprintln(w, "LOCAL_MODULE_HOST_CROSS_ARCH :=", archStr)

					}

				} else {

					if fi.module.Target().Arch.ArchType != android.Common {

						fmt.Fprintln(w, "LOCAL_MODULE_HOST_ARCH :=", archStr)

					}

				}

				host = true

			case android.Device:

			if fi.module.Target().Arch.ArchType != android.Common {

				archStr := fi.module.Target().Arch.ArchType.String()

				fmt.Fprintln(w, "LOCAL_MODULE_TARGET_ARCH :=", archStr)

			}

			}

			if host {

				makeOs := fi.module.Target().Os.String()

				if fi.module.Target().Os == android.Linux || fi.module.Target().Os == android.LinuxBionic || fi.module.Target().Os == android.LinuxMusl {

					makeOs = "linux"

				}

				fmt.Fprintln(w, "LOCAL_MODULE_HOST_OS :=", makeOs)

				fmt.Fprintln(w, "LOCAL_IS_HOST_MODULE := true")

			}

		} else if fi.isBazelPrebuilt && fi.arch != "" {

			// This apexFile comes from Bazel

			fmt.Fprintln(w, "LOCAL_MODULE_TARGET_ARCH :=", fi.arch)

apex/apex.go

+16 −86
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import ( 
	"android/soong/bazel/cquery"



	"github.com/google/blueprint"

	"github.com/google/blueprint/bootstrap"

	"github.com/google/blueprint/proptools"



	"android/soong/android"
@@ -37,7 +36,6 @@ import ( 
	"android/soong/filesystem"

	"android/soong/java"

	"android/soong/multitree"

	"android/soong/python"

	"android/soong/rust"

	"android/soong/sh"

)
@@ -487,12 +485,10 @@ const ( 
	app apexFileClass = iota

	appSet

	etc

	goBinary

	javaSharedLib

	nativeExecutable

	nativeSharedLib

	nativeTest

	pyBinary

	shBinary

)
@@ -501,12 +497,10 @@ var ( 
		"app":              app,

		"appSet":           appSet,

		"etc":              etc,

		"goBinary":         goBinary,

		"javaSharedLib":    javaSharedLib,

		"nativeExecutable": nativeExecutable,

		"nativeSharedLib":  nativeSharedLib,

		"nativeTest":       nativeTest,

		"pyBinary":         pyBinary,

		"shBinary":         shBinary,

	}

)
@@ -697,11 +691,10 @@ func addDependenciesForNativeModules(ctx android.BottomUpMutatorContext, nativeM 
	libVariations := append(target.Variations(), blueprint.Variation{Mutator: "link", Variation: "shared"})

	rustLibVariations := append(target.Variations(), blueprint.Variation{Mutator: "rust_libraries", Variation: "dylib"})



	if ctx.Device() {

	// Append "image" variation

	binVariations = append(binVariations, blueprint.Variation{Mutator: "image", Variation: imageVariation})

	libVariations = append(libVariations, blueprint.Variation{Mutator: "image", Variation: imageVariation})

	rustLibVariations = append(rustLibVariations, blueprint.Variation{Mutator: "image", Variation: imageVariation})

	}



	// Use *FarVariation* to be able to depend on modules having conflicting variations with

	// this module. This is required since arch variant of an APEX bundle is 'common' but it is
@@ -721,16 +714,7 @@ func addDependenciesForNativeModules(ctx android.BottomUpMutatorContext, nativeM 
}



func (a *apexBundle) combineProperties(ctx android.BottomUpMutatorContext) {

	if ctx.Device() {

	proptools.AppendProperties(&a.properties.Multilib, &a.targetProperties.Target.Android.Multilib, nil)

	} else {

		proptools.AppendProperties(&a.properties.Multilib, &a.targetProperties.Target.Host.Multilib, nil)

		if ctx.Os().Bionic() {

			proptools.AppendProperties(&a.properties.Multilib, &a.targetProperties.Target.Linux_bionic.Multilib, nil)

		} else {

			proptools.AppendProperties(&a.properties.Multilib, &a.targetProperties.Target.Linux_glibc.Multilib, nil)

		}

	}

}



// getImageVariationPair returns a pair for the image variation name as its
@@ -788,12 +772,6 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) { 
		}

	}

	for i, target := range targets {

		// Don't include artifacts for the host cross targets because there is no way for us

		// to run those artifacts natively on host

		if target.HostCross {

			continue

		}



		var deps ApexNativeDependencies



		// Add native modules targeting both ABIs. When multilib.* is omitted for
@@ -1230,8 +1208,8 @@ func apexTestForMutator(mctx android.BottomUpMutatorContext) { 
// be) available to platform

// TODO(jiyong): move this to android/apex.go?

func markPlatformAvailability(mctx android.BottomUpMutatorContext) {

	// Host and recovery are not considered as platform

	if mctx.Host() || mctx.Module().InstallInRecovery() {

	// Recovery is not considered as platform

	if mctx.Module().InstallInRecovery() {

		return

	}
@@ -1391,7 +1369,7 @@ var _ cc.Coverage = (*apexBundle)(nil) 


// Implements cc.Coverage

func (a *apexBundle) IsNativeCoverageNeeded(ctx android.BaseModuleContext) bool {

	return ctx.Device() && ctx.DeviceConfig().NativeCoverageEnabled()

	return ctx.DeviceConfig().NativeCoverageEnabled()

}



// Implements cc.Coverage
@@ -1502,21 +1480,17 @@ func (a *apexBundle) IsSanitizerEnabled(config android.Config, sanitizerName str 


	// Then follow the global setting

	var globalSanitizerNames []string

	if a.Host() {

		globalSanitizerNames = config.SanitizeHost()

	} else {

	arches := config.SanitizeDeviceArch()

	if len(arches) == 0 || android.InList(a.Arch().ArchType.Name, arches) {

		globalSanitizerNames = config.SanitizeDevice()

	}

	}

	return android.InList(sanitizerName, globalSanitizerNames)

}



func (a *apexBundle) AddSanitizerDependencies(ctx android.BottomUpMutatorContext, sanitizerName string) {

	// TODO(jiyong): move this info (the sanitizer name, the lib name, etc.) to cc/sanitize.go

	// Keep only the mechanism here.

	if ctx.Device() && sanitizerName == "hwaddress" && strings.HasPrefix(a.Name(), "com.android.runtime") {

	if sanitizerName == "hwaddress" && strings.HasPrefix(a.Name(), "com.android.runtime") {

		imageVariation := a.getImageVariation(ctx)

		for _, target := range ctx.MultiTargets() {

			if target.Arch.ArchType.Multilib == "lib64" {
@@ -1616,22 +1590,6 @@ func apexFileForRustLibrary(ctx android.BaseModuleContext, rustm *rust.Module) a 
	return newApexFile(ctx, fileToCopy, androidMkModuleName, dirInApex, nativeSharedLib, rustm)

}



func apexFileForPyBinary(ctx android.BaseModuleContext, py *python.PythonBinaryModule) apexFile {

	dirInApex := "bin"

	fileToCopy := py.HostToolPath().Path()

	return newApexFile(ctx, fileToCopy, py.BaseModuleName(), dirInApex, pyBinary, py)

}



func apexFileForGoBinary(ctx android.BaseModuleContext, depName string, gb bootstrap.GoBinaryTool) apexFile {

	dirInApex := "bin"

	fileToCopy := android.PathForGoBinary(ctx, gb)

	// NB: Since go binaries are static we don't need the module for anything here, which is

	// good since the go tool is a blueprint.Module not an android.Module like we would

	// normally use.

	//

	return newApexFile(ctx, fileToCopy, depName, dirInApex, goBinary, nil)

}



func apexFileForShBinary(ctx android.BaseModuleContext, sh *sh.ShBinary) apexFile {

	dirInApex := filepath.Join("bin", sh.SubDir())

	if sh.Target().NativeBridge == android.NativeBridgeEnabled {
@@ -1989,11 +1947,6 @@ func (a *apexBundle) setSystemLibLink(ctx android.ModuleContext) { 
	if !forced && updatable {

		a.linkToSystemLib = false

	}



	// We also don't want the optimization for host APEXes, because it doesn't make sense.

	if ctx.Host() {

		a.linkToSystemLib = false

	}

}



func (a *apexBundle) setPayloadFsType(ctx android.ModuleContext) {
@@ -2111,14 +2064,6 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, 
			case *cc.Module:

				vctx.filesInfo = append(vctx.filesInfo, apexFileForExecutable(ctx, ch))

				return true // track transitive dependencies

			case *python.PythonBinaryModule:

				if ch.HostToolPath().Valid() {

					vctx.filesInfo = append(vctx.filesInfo, apexFileForPyBinary(ctx, ch))

				}

			case bootstrap.GoBinaryTool:

				if a.Host() {

					vctx.filesInfo = append(vctx.filesInfo, apexFileForGoBinary(ctx, depName, ch))

				}

			case *rust.Module:

				vctx.filesInfo = append(vctx.filesInfo, apexFileForRustExecutable(ctx, ch))

				return true // track transitive dependencies
@@ -2280,12 +2225,6 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, 
			af := apexFileForNativeLibrary(ctx, ch, vctx.handleSpecialLibs)

			af.transitiveDep = true



			// Always track transitive dependencies for host.

			if a.Host() {

				vctx.filesInfo = append(vctx.filesInfo, af)

				return true

			}



			abInfo := ctx.Provider(ApexBundleInfoProvider).(ApexBundleInfo)

			if !abInfo.Contents.DirectlyInApex(depName) && (ch.IsStubs() || ch.HasStubsVariants()) {

				// If the dependency is a stubs lib, don't include it in this APEX,
@@ -2416,11 +2355,7 @@ func (a *apexBundle) shouldCheckDuplicate(ctx android.ModuleContext) bool { 
	if a.testApex {

		return false

	}

	// TODO(b/263309864) remove this

	if a.Host() {

		return false

	}

	if a.Device() && ctx.DeviceConfig().DeviceArch() == "" {

	if ctx.DeviceConfig().DeviceArch() == "" {

		return false

	}

	return true
@@ -2601,7 +2536,7 @@ func newApexBundle() *apexBundle { 
	module.AddProperties(&module.archProperties)

	module.AddProperties(&module.overridableProperties)



	android.InitAndroidMultiTargetsArchModule(module, android.HostAndDeviceSupported, android.MultilibCommon)

	android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon)

	android.InitDefaultableModule(module)

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

	android.InitBazelModule(module)
@@ -2832,7 +2767,7 @@ func minSdkVersionFromValue(ctx android.EarlyModuleContext, value string) androi 
// Ensures that a lib providing stub isn't statically linked

func (a *apexBundle) checkStaticLinkingToStubLibraries(ctx android.ModuleContext) {

	// Practically, we only care about regular APEXes on the device.

	if ctx.Host() || a.testApex || a.vndkApex {

	if a.testApex || a.vndkApex {

		return

	}
@@ -2927,7 +2862,7 @@ func (a *apexBundle) checkJavaStableSdkVersion(ctx android.ModuleContext) { 
// checkApexAvailability ensures that the all the dependencies are marked as available for this APEX.

func (a *apexBundle) checkApexAvailability(ctx android.ModuleContext) {

	// Let's be practical. Availability for test, host, and the VNDK apex isn't important

	if ctx.Host() || a.testApex || a.vndkApex {

	if a.testApex || a.vndkApex {

		return

	}
@@ -2985,11 +2920,6 @@ func (a *apexBundle) checkApexAvailability(ctx android.ModuleContext) { 


// checkStaticExecutable ensures that executables in an APEX are not static.

func (a *apexBundle) checkStaticExecutables(ctx android.ModuleContext) {

	// No need to run this for host APEXes

	if ctx.Host() {

		return

	}



	ctx.VisitDirectDepsBlueprint(func(module blueprint.Module) {

		if ctx.OtherModuleDependencyTag(module) != executableTag {

			return

apex/builder.go

+0 −5
Original line number Diff line number Diff line
@@ -958,11 +958,6 @@ func (a *apexBundle) buildApexDependencyInfo(ctx android.ModuleContext) { 
		return

	}



	if ctx.Host() {

		// No need to generate dependency info for host variant

		return

	}



	depInfos := android.DepNameToDepInfoMap{}

	a.WalkPayloadDeps(ctx, func(ctx android.ModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) bool {

		if from.Name() == to.Name() {

apex/key.go

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ type apexKeyProperties struct { 
func ApexKeyFactory() android.Module {

	module := &apexKey{}

	module.AddProperties(&module.properties)

	android.InitAndroidArchModule(module, android.HostAndDeviceDefault, android.MultilibCommon)

	android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)

	android.InitBazelModule(module)

	return module

}

apex/prebuilt.go

+1 −6
Original line number Diff line number Diff line
@@ -876,12 +876,7 @@ func (e *ApexExtractorProperties) prebuiltSrcs(ctx android.BaseModuleContext) [] 
		srcs = append(srcs, *e.Set)

	}



	var sanitizers []string

	if ctx.Host() {

		sanitizers = ctx.Config().SanitizeHost()

	} else {

		sanitizers = ctx.Config().SanitizeDevice()

	}

	sanitizers := ctx.Config().SanitizeDevice()



	if android.InList("address", sanitizers) && e.Sanitized.Address.Set != nil {

		srcs = append(srcs, *e.Sanitized.Address.Set)