Snap for 11162593 from 9b42f73e49716c26a66c13e297a84f64ac336bf4 to 24Q1-release (2146854e) · Commits · e / os / android_build_soong

cc/cc_test.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -4818,7 +4818,7 @@ func TestIncludeDirectoryOrdering(t *testing.T) {

		cflags := []string{"-Werror", "-std=candcpp"}
		cstd := []string{"-std=gnu17", "-std=conly"}
		cppstd := []string{"-std=gnu++17", "-std=cpp", "-fno-rtti"}
		cppstd := []string{"-std=gnu++20", "-std=cpp", "-fno-rtti"}

		lastIncludes := []string{
		"out/soong/ndk/sysroot/usr/include",

cc/config/global.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -357,7 +357,7 @@ var (
		}

		CStdVersion = "gnu17"
		CppStdVersion = "gnu++17"
		CppStdVersion = "gnu++20"
		ExperimentalCStdVersion = "gnu2x"
		ExperimentalCppStdVersion = "gnu++2a"

genrule/allowlists.go

+0 −2

Original line number	Diff line number	Diff line
		@@ -24,12 +24,10 @@ var (
		SandboxingDenyModuleList = []string{
		// go/keep-sorted start
		"CtsApkVerityTestDebugFiles",
		"aidl-golden-test-build-hook-gen",
		"aidl_camera_build_version",
		"camera-its",
		"libcore-non-cts-tests-txt",
		"swiftshader_spvtools_update_build_version",
		"vm-tests-tf-lib",
		// go/keep-sorted end
		}

java/aar.go

+52 −34

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ package java
		import (
		"fmt"
		"path/filepath"
		"slices"
		"strconv"
		"strings"

		@@ -110,7 +111,7 @@ type aaptProperties struct {
		type aapt struct {
		aaptSrcJar android.Path
		transitiveAaptRJars android.Paths
		transitiveAaptResourcePackages android.Paths
		transitiveAaptResourcePackagesFile android.Path
		exportPackage android.Path
		manifestPath android.Path
		proguardOptionsFile android.Path
		@@ -554,9 +555,16 @@ func (a *aapt) buildActions(ctx android.ModuleContext, opts aaptBuildActionOptio
		aapt2ExtractExtraPackages(ctx, extraPackages, srcJar)
		}

		transitiveAaptResourcePackages := staticDeps.resPackages().Strings()
		transitiveAaptResourcePackages = slices.DeleteFunc(transitiveAaptResourcePackages, func(p string) bool {
		return p == packageRes.String()
		})
		transitiveAaptResourcePackagesFile := android.PathForModuleOut(ctx, "transitive-res-packages")
		android.WriteFileRule(ctx, transitiveAaptResourcePackagesFile, strings.Join(transitiveAaptResourcePackages, "\n"))

		a.aaptSrcJar = srcJar
		a.transitiveAaptRJars = transitiveRJars
		a.transitiveAaptResourcePackages = staticDeps.resPackages()
		a.transitiveAaptResourcePackagesFile = transitiveAaptResourcePackagesFile
		a.exportPackage = packageRes
		a.manifestPath = manifestPath
		a.proguardOptionsFile = proguardOptionsFile
		@@ -822,9 +830,13 @@ func (a *AndroidLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext)

		proguardSpecInfo := a.collectProguardSpecInfo(ctx)
		ctx.SetProvider(ProguardSpecInfoProvider, proguardSpecInfo)
		a.exportedProguardFlagFiles = proguardSpecInfo.ProguardFlagsFiles.ToList()
		a.extraProguardFlagFiles = append(a.extraProguardFlagFiles, a.exportedProguardFlagFiles...)
		a.extraProguardFlagFiles = append(a.extraProguardFlagFiles, a.proguardOptionsFile)
		exportedProguardFlagsFiles := proguardSpecInfo.ProguardFlagsFiles.ToList()
		a.extraProguardFlagsFiles = append(a.extraProguardFlagsFiles, exportedProguardFlagsFiles...)
		a.extraProguardFlagsFiles = append(a.extraProguardFlagsFiles, a.proguardOptionsFile)

		combinedExportedProguardFlagFile := android.PathForModuleOut(ctx, "export_proguard_flags")
		writeCombinedProguardFlagsFile(ctx, combinedExportedProguardFlagFile, exportedProguardFlagsFiles)
		a.combinedExportedProguardFlagsFile = combinedExportedProguardFlagFile

		var extraSrcJars android.Paths
		var extraCombinedJars android.Paths
		@@ -945,7 +957,7 @@ type AARImport struct {
		classpathFile android.WritablePath
		proguardFlags android.WritablePath
		exportPackage android.WritablePath
		transitiveAaptResourcePackages android.Paths
		transitiveAaptResourcePackagesFile android.Path
		extraAaptPackagesFile android.WritablePath
		manifest android.WritablePath
		assetsPackage android.WritablePath
		@@ -1213,7 +1225,13 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		_ = staticManifestsDepSet
		a.manifestsDepSet = manifestDepSetBuilder.Build()

		a.transitiveAaptResourcePackages = staticDeps.resPackages()
		transitiveAaptResourcePackages := staticDeps.resPackages().Strings()
		transitiveAaptResourcePackages = slices.DeleteFunc(transitiveAaptResourcePackages, func(p string) bool {
		return p == a.exportPackage.String()
		})
		transitiveAaptResourcePackagesFile := android.PathForModuleOut(ctx, "transitive-res-packages")
		android.WriteFileRule(ctx, transitiveAaptResourcePackagesFile, strings.Join(transitiveAaptResourcePackages, "\n"))
		a.transitiveAaptResourcePackagesFile = transitiveAaptResourcePackagesFile

		a.collectTransitiveHeaderJars(ctx)
		ctx.SetProvider(JavaInfoProvider, JavaInfo{

java/androidmk.go

+3 −3

Original line number	Diff line number	Diff line
		@@ -274,7 +274,7 @@ func (prebuilt *AARImport) AndroidMkEntries() []android.AndroidMkEntries {
		entries.SetPath("LOCAL_SOONG_HEADER_JAR", prebuilt.classpathFile)
		entries.SetPath("LOCAL_SOONG_CLASSES_JAR", prebuilt.classpathFile)
		entries.SetPath("LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE", prebuilt.exportPackage)
		entries.SetPaths("LOCAL_SOONG_TRANSITIVE_RES_PACKAGES", prebuilt.transitiveAaptResourcePackages)
		entries.SetPath("LOCAL_SOONG_TRANSITIVE_RES_PACKAGES", prebuilt.transitiveAaptResourcePackagesFile)
		entries.SetPath("LOCAL_SOONG_EXPORT_PROGUARD_FLAGS", prebuilt.proguardFlags)
		entries.SetPath("LOCAL_SOONG_STATIC_LIBRARY_EXTRA_PACKAGES", prebuilt.extraAaptPackagesFile)
		entries.SetPath("LOCAL_FULL_MANIFEST_FILE", prebuilt.manifest)
		@@ -532,10 +532,10 @@ func (a *AndroidLibrary) AndroidMkEntries() []android.AndroidMkEntries {
		}

		entries.SetPath("LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE", a.exportPackage)
		entries.SetPaths("LOCAL_SOONG_TRANSITIVE_RES_PACKAGES", a.transitiveAaptResourcePackages)
		entries.SetPath("LOCAL_SOONG_TRANSITIVE_RES_PACKAGES", a.transitiveAaptResourcePackagesFile)
		entries.SetPath("LOCAL_SOONG_STATIC_LIBRARY_EXTRA_PACKAGES", a.extraAaptPackagesFile)
		entries.SetPath("LOCAL_FULL_MANIFEST_FILE", a.mergedManifestFile)
		entries.AddStrings("LOCAL_SOONG_EXPORT_PROGUARD_FLAGS", a.exportedProguardFlagFiles.Strings()...)
		entries.SetPath("LOCAL_SOONG_EXPORT_PROGUARD_FLAGS", a.combinedExportedProguardFlagsFile)
		entries.SetBoolIfTrue("LOCAL_UNINSTALLABLE_MODULE", true)
		entries.SetOptionalPaths("LOCAL_ACONFIG_FILES", a.getTransitiveAconfigFiles().ToList())
		})