StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove asset dir glob files" into main am: f2c204c655

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3257951

Change-Id: I49203ac5f042cad529c4f5f56186f4385a5126b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-09-06 16:31:20 +00:00
committed by Automerger Merge Worker
parent f6c08dba54 f2c204c655
commit 9d269b6956
3 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/defs.go
View File

@@ -16,7 +16,6 @@ package android
import ( import (
"github.com/google/blueprint" "github.com/google/blueprint"
"github.com/google/blueprint/bootstrap"
) )
var ( var (
@@ -120,8 +119,3 @@ func init() {
return ctx.Config().RBEWrapper() return ctx.Config().RBEWrapper()
}) })
} }
// GlobToListFileRule creates a rule that writes a list of files matching a pattern to a file.
func GlobToListFileRule(ctx ModuleContext, pattern string, excludes []string, file WritablePath) {
bootstrap.GlobFile(ctx.blueprintModuleContext(), pattern, excludes, file.String())
}

17
java/aar.go
View File

@@ -15,10 +15,10 @@
package java package java
import ( import (
"crypto/sha256"
"fmt" "fmt"
"path/filepath" "path/filepath"
"slices" "slices"
"strconv"
"strings" "strings"
"android/soong/android" "android/soong/android"
@@ -236,18 +236,20 @@ func (a *aapt) aapt2Flags(ctx android.ModuleContext, sdkContext android.SdkConte
rroDirs = append(rroDirs, resRRODirs...) rroDirs = append(rroDirs, resRRODirs...)
} }
assetDirsHasher := sha256.New()
var assetDeps android.Paths var assetDeps android.Paths
for i, dir := range assetDirs { for _, dir := range assetDirs {
// Add a dependency on every file in the asset directory. This ensures the aapt2 // Add a dependency on every file in the asset directory. This ensures the aapt2
// rule will be rerun if one of the files in the asset directory is modified. // rule will be rerun if one of the files in the asset directory is modified.
assetDeps = append(assetDeps, androidResourceGlob(ctx, dir)...) dirContents := androidResourceGlob(ctx, dir)
assetDeps = append(assetDeps, dirContents...)
// Add a dependency on a file that contains a list of all the files in the asset directory. // Add a hash of all the files in the asset directory to the command line.
// This ensures the aapt2 rule will be run if a file is removed from the asset directory, // This ensures the aapt2 rule will be run if a file is removed from the asset directory,
// or a file is added whose timestamp is older than the output of aapt2. // or a file is added whose timestamp is older than the output of aapt2.
assetFileListFile := android.PathForModuleOut(ctx, "asset_dir_globs", strconv.Itoa(i)+".glob") for _, path := range dirContents.Strings() {
androidResourceGlobList(ctx, dir, assetFileListFile) assetDirsHasher.Write([]byte(path))
assetDeps = append(assetDeps, assetFileListFile) }
} }
assetDirStrings := assetDirs.Strings() assetDirStrings := assetDirs.Strings()
@@ -282,6 +284,7 @@ func (a *aapt) aapt2Flags(ctx android.ModuleContext, sdkContext android.SdkConte
linkDeps = append(linkDeps, manifestPath) linkDeps = append(linkDeps, manifestPath)
linkFlags = append(linkFlags, android.JoinWithPrefix(assetDirStrings, "-A ")) linkFlags = append(linkFlags, android.JoinWithPrefix(assetDirStrings, "-A "))
linkFlags = append(linkFlags, fmt.Sprintf("$$(: %x)", assetDirsHasher.Sum(nil)))
linkDeps = append(linkDeps, assetDeps...) linkDeps = append(linkDeps, assetDeps...)
// Returns the effective version for {min|target}_sdk_version // Returns the effective version for {min|target}_sdk_version

9
java/android_resources.go
View File

@@ -39,15 +39,6 @@ func androidResourceGlob(ctx android.EarlyModuleContext, dir android.Path) andro
return ctx.GlobFiles(filepath.Join(dir.String(), "**/*"), androidResourceIgnoreFilenames) return ctx.GlobFiles(filepath.Join(dir.String(), "**/*"), androidResourceIgnoreFilenames)
} }
// androidResourceGlobList creates a rule to write the list of files in the given directory, using
// the standard exclusion patterns for Android resources, to the given output file.
func androidResourceGlobList(ctx android.ModuleContext, dir android.Path,
fileListFile android.WritablePath) {
android.GlobToListFileRule(ctx, filepath.Join(dir.String(), "**/*"),
androidResourceIgnoreFilenames, fileListFile)
}
type overlayType int type overlayType int
const ( const (