Allow for the installation of binaries in xbin am: 0dbe615ff4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1861933 Change-Id: I9638084215749cac8a551c34ae4e963c0b39530d
This commit is contained in:
@@ -29,6 +29,9 @@ type InstallerProperties struct {
|
|||||||
// Install output directly in {partition}/, not in any subdir. This is only intended for use by
|
// Install output directly in {partition}/, not in any subdir. This is only intended for use by
|
||||||
// init_first_stage.
|
// init_first_stage.
|
||||||
Install_in_root *bool `android:"arch_variant"`
|
Install_in_root *bool `android:"arch_variant"`
|
||||||
|
|
||||||
|
// Install output directly in {partition}/xbin
|
||||||
|
Install_in_xbin *bool `android:"arch_vvariant"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type installLocation int
|
type installLocation int
|
||||||
@@ -73,6 +76,8 @@ func (installer *baseInstaller) installDir(ctx ModuleContext) android.InstallPat
|
|||||||
|
|
||||||
if installer.installInRoot() {
|
if installer.installInRoot() {
|
||||||
dir = ""
|
dir = ""
|
||||||
|
} else if installer.installInXbin() {
|
||||||
|
dir = "xbin"
|
||||||
}
|
}
|
||||||
|
|
||||||
if ctx.Target().NativeBridge == android.NativeBridgeEnabled {
|
if ctx.Target().NativeBridge == android.NativeBridgeEnabled {
|
||||||
@@ -123,3 +128,7 @@ func (installer *baseInstaller) makeUninstallable(mod *Module) {
|
|||||||
func (installer *baseInstaller) installInRoot() bool {
|
func (installer *baseInstaller) installInRoot() bool {
|
||||||
return Bool(installer.Properties.Install_in_root)
|
return Bool(installer.Properties.Install_in_root)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (installer *baseInstaller) installInXbin() bool {
|
||||||
|
return Bool(installer.Properties.Install_in_xbin)
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user