Support aapt2 resources flagging
This change modifies the aconfig and aapt2 build rules to support resources flagging in aapt2. Implementation details: - Modify the aconfig text rule to include flag permission in the output text file - Pass the `--flags-packages` argument to `aapt2 compile` command, similar to what is currently being done in the `aapt2 link` command Bug: 344979955 Test: m nothing --no-skip-soong-tests Change-Id: I3b0b1fd6dcd691b7cc50ba3d081ecafd82c2c904
This commit is contained in:
@@ -440,7 +440,8 @@ func (a *aapt) buildActions(ctx android.ModuleContext, opts aaptBuildActionOptio
|
||||
var compiledResDirs []android.Paths
|
||||
for _, dir := range resDirs {
|
||||
a.resourceFiles = append(a.resourceFiles, dir.files...)
|
||||
compiledResDirs = append(compiledResDirs, aapt2Compile(ctx, dir.dir, dir.files, compileFlags, a.filterProduct()).Paths())
|
||||
compiledResDirs = append(compiledResDirs, aapt2Compile(ctx, dir.dir, dir.files,
|
||||
compileFlags, a.filterProduct(), opts.aconfigTextFiles).Paths())
|
||||
}
|
||||
|
||||
for i, zip := range resZips {
|
||||
@@ -499,7 +500,8 @@ func (a *aapt) buildActions(ctx android.ModuleContext, opts aaptBuildActionOptio
|
||||
}
|
||||
|
||||
for _, dir := range overlayDirs {
|
||||
compiledOverlay = append(compiledOverlay, aapt2Compile(ctx, dir.dir, dir.files, compileFlags, a.filterProduct()).Paths()...)
|
||||
compiledOverlay = append(compiledOverlay, aapt2Compile(ctx, dir.dir, dir.files,
|
||||
compileFlags, a.filterProduct(), opts.aconfigTextFiles).Paths()...)
|
||||
}
|
||||
|
||||
var splitPackages android.WritablePaths
|
||||
|
Reference in New Issue
Block a user