ScoopDroid/android_build_soong
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fsgen: Use prebuilt_{root,any} in case install_in_root is set

Browse source 
If any of the other modules relative dir matches (eg lib/) it
would hit a neverallow as installing in the root directory
is allowlisted.

Test: m --no-skip-soong-tests
Test: m on tegra device with
PRODUCT_COPY_FILES += \
    tegra21x_xusb_firmware:recovery/root/tegra21x_xusb_firmware \

Change-Id: I157826703974544614f0049b8fa157358e7b17a7
This commit is contained in:
Luca Stefani 2025-03-19 21:21:04 +01:00
parent 6f53e14455
commit fc4af1f5cc
No known key found for this signature in database
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fsgen/prebuilt_etc_modules_gen.go
View file

@ -335,6 +335,10 @@ func createPrebuiltEtcModulesInDirectory(ctx android.LoadHookContext, partition,
propsList = append(propsList, &prebuiltInstallInRootProperties{
Install_in_root: proptools.BoolPtr(true),
})
// Discard any previously picked module and force it to prebuilt_{root,any} as
// they are the only modules allowed to specify the `install_in_root` property.
etcInstallPathKey = ""
relDestDirFromInstallDirBase = destDir
}
// Set appropriate srcs, dsts, and releative_install_path based on