diff options
| author | 2025-03-06 12:51:49 -0800 | |
|---|---|---|
| committer | 2025-03-06 12:51:49 -0800 | |
| commit | 6f1b833586df7e714ba45093f61ef97fcec5e60c (patch) | |
| tree | daf92889156f2049cc84cc06ae9aac56abd1bc1e /fsgen/filesystem_creator.go | |
| parent | 4669a9b8bfad22743152b5306c2856bcfabdda07 (diff) | |
| parent | eb8d529c0a6cee5ae390ea9b6964fc59af004c6b (diff) | |
Merge "Dist build.prop files in soong" into main am: eb8d529c0a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3527718
Change-Id: I5f17d943210caabf69eb96f2544ed90a57157f98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'fsgen/filesystem_creator.go')
| -rw-r--r-- | fsgen/filesystem_creator.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go index 29d5e791c..b73fb219f 100644 --- a/fsgen/filesystem_creator.go +++ b/fsgen/filesystem_creator.go @@ -854,19 +854,29 @@ func (f *filesystemCreator) createVendorBuildProp(ctx android.LoadHookContext) { Product_config *string Android_info *string Licenses []string + Dist android.Dist }{ Name: proptools.StringPtr(generatedModuleName(ctx.Config(), "vendor-build.prop")), Vendor: proptools.BoolPtr(true), Stem: proptools.StringPtr("build.prop"), Product_config: proptools.StringPtr(":product_config"), Android_info: proptools.StringPtr(":" + generatedModuleName(ctx.Config(), "android_info.prop")), - Licenses: []string{"Android-Apache-2.0"}, + Dist: android.Dist{ + Targets: []string{"droidcore-unbundled"}, + Dest: proptools.StringPtr("build.prop-vendor"), + }, + Licenses: []string{"Android-Apache-2.0"}, } vendorBuildProp := ctx.CreateModule( android.BuildPropFactory, vendorBuildProps, ) - vendorBuildProp.HideFromMake() + // We don't want this to conflict with the make-built vendor build.prop, but unfortunately + // calling HideFromMake() prevents disting files, even in soong-only mode. So only call + // HideFromMake() on soong+make builds. + if ctx.Config().KatiEnabled() { + vendorBuildProp.HideFromMake() + } } func createRecoveryBuildProp(ctx android.LoadHookContext) string { |