diff options
Diffstat (limited to 'aconfig/build_flags/build_flags.go')
| -rw-r--r-- | aconfig/build_flags/build_flags.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/aconfig/build_flags/build_flags.go b/aconfig/build_flags/build_flags.go index 94e1eb193..a9415f8b3 100644 --- a/aconfig/build_flags/build_flags.go +++ b/aconfig/build_flags/build_flags.go @@ -44,14 +44,22 @@ func buildFlagsFactory() android.Module { return module } +func (m *buildFlags) UseGenericConfig() bool { + return false +} + func (m *buildFlags) GenerateAndroidBuildActions(ctx android.ModuleContext) { // Read the build_flags_<partition>.json file generated by soong // 'release-config' command. - srcPath := android.PathForOutput(ctx, "release-config", fmt.Sprintf("build_flags_%s.json", m.PartitionTag(ctx.DeviceConfig()))) + product := "None" + if ctx.Config().HasDeviceProduct() { + product = ctx.Config().DeviceProduct() + } + srcPath := android.PathForOutput(ctx, "release-config", fmt.Sprintf("build_flags_%s-%s.json", product, m.PartitionTag(ctx.DeviceConfig()))) outputPath := android.PathForModuleOut(ctx, outJsonFileName) // The 'release-config' command is called for every build, and generates the - // build_flags_<partition>.json file. + // build_flags_<target_product>-<partition>.json file. // Update the output file only if the source file is changed. ctx.Build(pctx, android.BuildParams{ Rule: android.CpIfChanged, |