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/androidmk.go b/android/androidmk.go
index 9f711bf..1d11161 100644
--- a/android/androidmk.go
+++ b/android/androidmk.go
@@ -242,7 +242,7 @@
if Bool(amod.commonProperties.Product_specific) {
fmt.Fprintln(&data.preamble, "LOCAL_PRODUCT_MODULE := true")
}
- if Bool(amod.commonProperties.ProductServices_specific) {
+ if Bool(amod.commonProperties.Product_services_specific) {
fmt.Fprintln(&data.preamble, "LOCAL_PRODUCT_SERVICES_MODULE := true")
}
if amod.commonProperties.Owner != nil {
diff --git a/android/config.go b/android/config.go
index 0015c02..3a2a005 100644
--- a/android/config.go
+++ b/android/config.go
@@ -767,7 +767,7 @@
if c.config.productVariables.ProductServicesPath != nil {
return *c.config.productVariables.ProductServicesPath
}
- return "product-services"
+ return "product_services"
}
func (c *deviceConfig) BtConfigIncludeDir() string {
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 {
diff --git a/android/paths_test.go b/android/paths_test.go
index ff0eeb3..fbeccb1 100644
--- a/android/paths_test.go
+++ b/android/paths_test.go
@@ -293,7 +293,7 @@
out: "target/product/test_device/product/bin/my_test",
},
{
- name: "product-services binary",
+ name: "product_services binary",
ctx: &moduleInstallPathContextImpl{
androidBaseContextImpl: androidBaseContextImpl{
target: deviceTarget,
@@ -301,7 +301,7 @@
},
},
in: []string{"bin", "my_test"},
- out: "target/product/test_device/product-services/bin/my_test",
+ out: "target/product/test_device/product_services/bin/my_test",
},
{
@@ -353,7 +353,7 @@
},
{
- name: "product-services native test binary",
+ name: "product_services native test binary",
ctx: &moduleInstallPathContextImpl{
androidBaseContextImpl: androidBaseContextImpl{
target: deviceTarget,
@@ -414,7 +414,7 @@
},
{
- name: "sanitized product-services binary",
+ name: "sanitized product_services binary",
ctx: &moduleInstallPathContextImpl{
androidBaseContextImpl: androidBaseContextImpl{
target: deviceTarget,
@@ -423,7 +423,7 @@
inSanitizerDir: true,
},
in: []string{"bin", "my_test"},
- out: "target/product/test_device/data/asan/product-services/bin/my_test",
+ out: "target/product/test_device/data/asan/product_services/bin/my_test",
},
{
@@ -478,7 +478,7 @@
out: "target/product/test_device/data/asan/data/nativetest/my_test",
},
{
- name: "sanitized product-services native test binary",
+ name: "sanitized product_services native test binary",
ctx: &moduleInstallPathContextImpl{
androidBaseContextImpl: androidBaseContextImpl{
target: deviceTarget,