StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make all the PrebuiltEtc modules defaultable." am: 1e78f58168 am: c651c1692b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1856366

Change-Id: Iceacf91446c7deea787044cb0c48624351144d11
This commit is contained in:
Martin Stjernholm
2021-10-15 14:17:06 +00:00
committed by Automerger Merge Worker
parent 3853562adb c651c1692b
commit ccf24516cf
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
etc/prebuilt_etc.go
View File

@@ -439,6 +439,7 @@ func PrebuiltEtcHostFactory() android.Module {
InitPrebuiltEtcModule(module, "etc")
// This module is host-only
android.InitAndroidArchModule(module, android.HostSupported, android.MultilibCommon)
android.InitDefaultableModule(module)
return module
}
@@ -449,6 +450,7 @@ func PrebuiltRootFactory() android.Module {
InitPrebuiltRootModule(module)
// This module is device-only
android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibFirst)
android.InitDefaultableModule(module)
return module
}
@@ -459,6 +461,7 @@ func PrebuiltUserShareFactory() android.Module {
InitPrebuiltEtcModule(module, "usr/share")
// This module is device-only
android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibFirst)
android.InitDefaultableModule(module)
return module
}
@@ -469,6 +472,7 @@ func PrebuiltUserShareHostFactory() android.Module {
InitPrebuiltEtcModule(module, "usr/share")
// This module is host-only
android.InitAndroidArchModule(module, android.HostSupported, android.MultilibCommon)
android.InitDefaultableModule(module)
return module
}
@@ -478,6 +482,7 @@ func PrebuiltFontFactory() android.Module {
InitPrebuiltEtcModule(module, "fonts")
// This module is device-only
android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibFirst)
android.InitDefaultableModule(module)
return module
}
@@ -491,6 +496,7 @@ func PrebuiltFirmwareFactory() android.Module {
InitPrebuiltEtcModule(module, "etc/firmware")
// This module is device-only
android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibFirst)
android.InitDefaultableModule(module)
return module
}
@@ -503,6 +509,7 @@ func PrebuiltDSPFactory() android.Module {
InitPrebuiltEtcModule(module, "etc/dsp")
// This module is device-only
android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibFirst)
android.InitDefaultableModule(module)
return module
}
@@ -516,6 +523,7 @@ func PrebuiltRFSAFactory() android.Module {
InitPrebuiltEtcModule(module, "lib/rfsa")
// This module is device-only
android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibFirst)
android.InitDefaultableModule(module)
return module
}