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

s/product-services/product_services/g

Browse Source 
Attempting to reduce the number of different spellings we have for
"product services" partition in the codebase.

Bug: 112431447
Test: m
Change-Id: I0a393a1d625e7ea3217d28735a4db709bce32395
Merged-In: I0a393a1d625e7ea3217d28735a4db709bce32395
This commit is contained in:
Dario Freni
2018-08-17 00:57:57 +01:00
committed by Yifan Hong
parent 280febfb14
commit 95cf767918
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android/module.go
View File

@@ -243,9 +243,9 @@ type commonProperties struct {
Product_specific *bool
// whether this module provides services owned by the OS provider to the core platform. When set
// to true, it is installed into /product-services (or /system/product-services if
// product-services partition does not exist).
ProductServices_specific *bool
// to true, it is installed into /product_services (or /system/product_services if
// product_services partition does not exist).
Product_services_specific *bool
// Whether this module is installed to recovery partition
Recovery *bool
@@ -548,7 +548,7 @@ func (a *ModuleBase) ProductSpecific() bool {
}
func (a *ModuleBase) ProductServicesSpecific() bool {
return Bool(a.commonProperties.ProductServices_specific)
return Bool(a.commonProperties.Product_services_specific)
}
func (a *ModuleBase) Enabled() bool {
@@ -661,7 +661,7 @@ func determineModuleKind(a *ModuleBase, ctx blueprint.BaseModuleContext) moduleK
var socSpecific = Bool(a.commonProperties.Vendor) || Bool(a.commonProperties.Proprietary) || Bool(a.commonProperties.Soc_specific)
var deviceSpecific = Bool(a.commonProperties.Device_specific)
var productSpecific = Bool(a.commonProperties.Product_specific)
var productServicesSpecific = Bool(a.commonProperties.ProductServices_specific)
var productServicesSpecific = Bool(a.commonProperties.Product_services_specific)
msg := "conflicting value set here"
if socSpecific && deviceSpecific {