s/product-services/product_services/g
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
diff --git a/android/module.go b/android/module.go
index ac7e606..a058199 100644
--- a/android/module.go
+++ b/android/module.go
@@ -243,9 +243,9 @@
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) ProductServicesSpecific() bool {
- return Bool(a.commonProperties.ProductServices_specific)
+ return Bool(a.commonProperties.Product_services_specific)
}
func (a *ModuleBase) Enabled() bool {
@@ -661,7 +661,7 @@
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 {