Merge changes from topic "soong_vendor_build_prop" into main
* changes:
Autogenerate a vendor-build.prop for the current product
Add vendor to list of supported partitions in gen_build_prop.py
diff --git a/android/licenses.go b/android/licenses.go
index 949d678..53d0555 100644
--- a/android/licenses.go
+++ b/android/licenses.go
@@ -15,7 +15,10 @@
package android
import (
+ "fmt"
+ "path/filepath"
"reflect"
+ "strings"
"sync"
"github.com/google/blueprint"
@@ -155,7 +158,25 @@
}
licenses := getLicenses(ctx, m)
- ctx.AddVariationDependencies(nil, licensesTag, licenses...)
+
+ var fullyQualifiedLicenseNames []string
+ for _, license := range licenses {
+ fullyQualifiedLicenseName := license
+ if !strings.HasPrefix(license, "//") {
+ licenseModuleDir := ctx.OtherModuleDir(m)
+ for licenseModuleDir != "." && !ctx.OtherModuleExists(fmt.Sprintf("//%s:%s", licenseModuleDir, license)) {
+ licenseModuleDir = filepath.Dir(licenseModuleDir)
+ }
+ if licenseModuleDir == "." {
+ fullyQualifiedLicenseName = license
+ } else {
+ fullyQualifiedLicenseName = fmt.Sprintf("//%s:%s", licenseModuleDir, license)
+ }
+ }
+ fullyQualifiedLicenseNames = append(fullyQualifiedLicenseNames, fullyQualifiedLicenseName)
+ }
+
+ ctx.AddVariationDependencies(nil, licensesTag, fullyQualifiedLicenseNames...)
}
// Verifies the license and license_kind dependencies are each the correct kind of module.
diff --git a/etc/prebuilt_etc.go b/etc/prebuilt_etc.go
index f17a5de..ce72fed 100644
--- a/etc/prebuilt_etc.go
+++ b/etc/prebuilt_etc.go
@@ -66,6 +66,9 @@
ctx.RegisterModuleType("prebuilt_rfsa", PrebuiltRFSAFactory)
ctx.RegisterModuleType("prebuilt_renderscript_bitcode", PrebuiltRenderScriptBitcodeFactory)
ctx.RegisterModuleType("prebuilt_media_audio", PrebuiltMediaAudioFactory)
+ ctx.RegisterModuleType("prebuilt_voicepack", PrebuiltVoicepackFactory)
+ ctx.RegisterModuleType("prebuilt_bin", PrebuiltBinaryFactory)
+ ctx.RegisterModuleType("prebuilt_wallpaper", PrebuiltWallpaperFactory)
ctx.RegisterModuleType("prebuilt_defaults", defaultsFactory)
@@ -799,3 +802,33 @@
android.InitDefaultableModule(module)
return module
}
+
+// prebuilt_voicepack installs voice pack files in <partition>/tts directory.
+func PrebuiltVoicepackFactory() android.Module {
+ module := &PrebuiltEtc{}
+ InitPrebuiltEtcModule(module, "tts")
+ // This module is device-only
+ android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
+ android.InitDefaultableModule(module)
+ return module
+}
+
+// prebuilt_bin installs files in <partition>/bin directory.
+func PrebuiltBinaryFactory() android.Module {
+ module := &PrebuiltEtc{}
+ InitPrebuiltEtcModule(module, "bin")
+ // This module is device-only
+ android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibFirst)
+ android.InitDefaultableModule(module)
+ return module
+}
+
+// prebuilt_wallpaper installs image files in <partition>/wallpaper directory.
+func PrebuiltWallpaperFactory() android.Module {
+ module := &PrebuiltEtc{}
+ InitPrebuiltEtcModule(module, "wallpaper")
+ // This module is device-only
+ android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
+ android.InitDefaultableModule(module)
+ return module
+}