Snap for 11186783 from 62f77ac18991318935d041c35c92fe65774cae73 to 24Q1-release (b4cee334) · Commits · e / os / android_build_soong

android/config.go

+11 −4

Original line number	Diff line number	Diff line
		@@ -195,10 +195,12 @@ func (c Config) MaxPageSizeSupported() string {
		return String(c.config.productVariables.DeviceMaxPageSizeSupported)
		}

		// PageSizeAgnostic returns true when AOSP is page size agnostic,
		// othersise it returns false.
		func (c Config) PageSizeAgnostic() bool {
		return Bool(c.config.productVariables.DevicePageSizeAgnostic)
		// NoBionicPageSizeMacro returns true when AOSP is page size agnostic.
		// This means that the bionic's macro PAGE_SIZE won't be defined.
		// Returns false when AOSP is NOT page size agnostic.
		// This means that bionic's macro PAGE_SIZE is defined.
		func (c Config) NoBionicPageSizeMacro() bool {
		return Bool(c.config.productVariables.DeviceNoBionicPageSizeMacro)
		}

		// The release version passed to aconfig, derived from RELEASE_VERSION
		@@ -239,6 +241,11 @@ func (c Config) ReleaseDefaultModuleBuildFromSource() bool {
		Bool(c.config.productVariables.ReleaseDefaultModuleBuildFromSource)
		}

		// Enables ABI monitoring of NDK libraries
		func (c Config) ReleaseNdkAbiMonitored() bool {
		return c.config.productVariables.GetBuildFlagBool("RELEASE_NDK_ABI_MONITORED")
		}

		// A DeviceConfig object represents the configuration for a particular device
		// being built. For now there will only be one of these, but in the future there
		// may be multiple devices being built.

+1 −0

Original line number	Diff line number	Diff line
		@@ -290,6 +290,7 @@ func (fg *fileGroup) GenerateAndroidBuildActions(ctx ModuleContext) {
		if fg.properties.Path != nil {
		fg.srcs = PathsWithModuleSrcSubDir(ctx, fg.srcs, String(fg.properties.Path))
		}
		ctx.SetProvider(blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: fg.srcs.Strings()})
		}

		func (fg *fileGroup) Srcs() Paths {

+15 −15

Original line number	Diff line number	Diff line
		@@ -224,7 +224,7 @@ type ProductVariables struct {
		DeviceCurrentApiLevelForVendorModules *string `json:",omitempty"`
		DeviceSystemSdkVersions []string `json:",omitempty"`
		DeviceMaxPageSizeSupported *string `json:",omitempty"`
		DevicePageSizeAgnostic *bool `json:",omitempty"`
		DeviceNoBionicPageSizeMacro *bool `json:",omitempty"`

		VendorApiLevel *string `json:",omitempty"`

		@@ -595,7 +595,7 @@ func (v *ProductVariables) SetDefaultConfig() {
		DeviceSecondaryCpuVariant: stringPtr("generic"),
		DeviceSecondaryAbi: []string{"armeabi-v7a", "armeabi"},
		DeviceMaxPageSizeSupported: stringPtr("4096"),
		DevicePageSizeAgnostic: boolPtr(false),
		DeviceNoBionicPageSizeMacro: boolPtr(false),

		AAPTConfig: []string{"normal", "large", "xlarge", "hdpi", "xhdpi", "xxhdpi"},
		AAPTPreferredConfig: stringPtr("xhdpi"),

+2 −1

Original line number	Diff line number	Diff line
		@@ -165,10 +165,11 @@ func (s *sdkRepoHost) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		Flag(dir.Join(ctx, strip).String())
		}
		} else {
		llvmObjCopy := config.ClangPath(ctx, "bin/llvm-objcopy")
		llvmStrip := config.ClangPath(ctx, "bin/llvm-strip")
		llvmLib := config.ClangPath(ctx, "lib/x86_64-unknown-linux-gnu/libc++.so")
		for _, strip := range s.properties.Strip_files {
		cmd := builder.Command().Tool(llvmStrip).ImplicitTool(llvmLib)
		cmd := builder.Command().Tool(llvmStrip).ImplicitTool(llvmLib).ImplicitTool(llvmObjCopy)
		if !ctx.Windows() {
		cmd.Flag("-x")
		}

+7 −4

Original line number	Diff line number	Diff line
		@@ -2067,8 +2067,15 @@ func (a apexBundle) depVisitor(vctx visitorContext, ctx android.ModuleContext,
		switch depTag {
		case sharedLibTag, jniLibTag:
		isJniLib := depTag == jniLibTag
		propertyName := "native_shared_libs"
		if isJniLib {
		propertyName = "jni_libs"
		}
		switch ch := child.(type) {
		case *cc.Module:
		if ch.IsStubs() {
		ctx.PropertyErrorf(propertyName, "%q is a stub. Remove it from the list.", depName)
		}
		fi := apexFileForNativeLibrary(ctx, ch, vctx.handleSpecialLibs)
		fi.isJniLib = isJniLib
		vctx.filesInfo = append(vctx.filesInfo, fi)
		@@ -2086,10 +2093,6 @@ func (a apexBundle) depVisitor(vctx visitorContext, ctx android.ModuleContext,
		vctx.filesInfo = append(vctx.filesInfo, fi)
		return true // track transitive dependencies
		default:
		propertyName := "native_shared_libs"
		if isJniLib {
		propertyName = "jni_libs"
		}
		ctx.PropertyErrorf(propertyName, "%q is not a cc_library or cc_library_shared module", depName)
		}
		case executableTag: