summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Spandan Das <spandandas@google.com> 2024-10-25 21:06:18 +0000
committer Spandan Das <spandandas@google.com> 2024-10-28 19:52:47 +0000
commit859cdef88b917a31698310af7edf30fa06c2440e (patch)
treebd4cbf2e2bea08df3121880bc8fbd93e9f421594
parent0ba7034bf723aaf35db29811f6709aec5828b487 (diff)
Add vendor to list of supported partitions in gen_build_prop.py
The kati built vendor.img will still use the kati built vendor build.prop file, but the soong built vendor.img will use an autogenerated `build_prop` module for vendor This CL should be a noop for now Bug: 374371755 Test: diff in contents for aosp_cf_x86_64_phone https://paste.googleplex.com/5766413037076480 Summary - timestamp change (expected) - ro.hwui.use_vulkan changes from "" to false, but I think this is functionally equivalent Test: presubmits Change-Id: I10bc5b6e8d48b86fa70d5ab0722fee658b1a224a
-rw-r--r--android/build_prop.go4
-rw-r--r--android/config.go4
-rw-r--r--android/variable.go1
-rw-r--r--scripts/gen_build_prop.py6
4 files changed, 11 insertions, 4 deletions
diff --git a/android/build_prop.go b/android/build_prop.go
index ede93ed20..120ad94d1 100644
--- a/android/build_prop.go
+++ b/android/build_prop.go
@@ -65,6 +65,9 @@ func (p *buildPropModule) propFiles(ctx ModuleContext) Paths {
return ctx.Config().ProductPropFiles(ctx)
} else if partition == "odm" {
return ctx.Config().OdmPropFiles(ctx)
+ } else if partition == "vendor" {
+ // TODO (b/375500423): Add android-info.txt to prop files
+ return ctx.Config().VendorPropFiles(ctx)
}
return nil
}
@@ -104,6 +107,7 @@ var validPartitions = []string{
"system_ext",
"product",
"odm",
+ "vendor",
}
func (p *buildPropModule) GenerateAndroidBuildActions(ctx ModuleContext) {
diff --git a/android/config.go b/android/config.go
index 1e518406a..feed22f6a 100644
--- a/android/config.go
+++ b/android/config.go
@@ -2195,6 +2195,10 @@ func (c *config) OdmPropFiles(ctx PathContext) Paths {
return PathsForSource(ctx, c.productVariables.OdmPropFiles)
}
+func (c *config) VendorPropFiles(ctx PathContext) Paths {
+ return PathsForSource(ctx, c.productVariables.VendorPropFiles)
+}
+
func (c *config) ExtraAllowedDepsTxt() string {
return String(c.productVariables.ExtraAllowedDepsTxt)
}
diff --git a/android/variable.go b/android/variable.go
index c35294200..6693d9197 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -521,6 +521,7 @@ type ProductVariables struct {
SystemExtPropFiles []string `json:",omitempty"`
ProductPropFiles []string `json:",omitempty"`
OdmPropFiles []string `json:",omitempty"`
+ VendorPropFiles []string `json:",omitempty"`
EnableUffdGc *string `json:",omitempty"`
diff --git a/scripts/gen_build_prop.py b/scripts/gen_build_prop.py
index df9e98d1e..e0686ed19 100644
--- a/scripts/gen_build_prop.py
+++ b/scripts/gen_build_prop.py
@@ -524,7 +524,6 @@ def build_system_ext_prop(args):
build_prop(args, gen_build_info=False, gen_common_build_props=True, variables=variables)
-'''
def build_vendor_prop(args):
config = args.config
@@ -541,7 +540,6 @@ def build_vendor_prop(args):
]
build_prop(args, gen_build_info=False, gen_common_build_props=True, variables=variables)
-'''
def build_product_prop(args):
config = args.config
@@ -608,8 +606,8 @@ def main():
build_odm_prop(args)
case "product":
build_product_prop(args)
- # case "vendor": # NOT IMPLEMENTED
- # build_vendor_prop(args)
+ case "vendor":
+ build_vendor_prop(args)
case _:
sys.exit(f"not supported partition {args.partition}")