Merge "s/product-services/product_services/g" (7bbacf34) · Commits · e / os / android_build_soong

android/androidmk.go

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -242,7 +242,7 @@ func translateAndroidMkModule(ctx SingletonContext, w io.Writer, mod blueprint.M
	if Bool(amod.commonProperties.Product_specific) {		if Bool(amod.commonProperties.Product_specific) {
	fmt.Fprintln(&data.preamble, "LOCAL_PRODUCT_MODULE := true")		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")		fmt.Fprintln(&data.preamble, "LOCAL_PRODUCT_SERVICES_MODULE := true")
	}		}
	if amod.commonProperties.Owner != nil {		if amod.commonProperties.Owner != nil {

android/config.go

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -767,7 +767,7 @@ func (c *deviceConfig) ProductServicesPath() string {
	if c.config.productVariables.ProductServicesPath != nil {		if c.config.productVariables.ProductServicesPath != nil {
	return *c.config.productVariables.ProductServicesPath		return *c.config.productVariables.ProductServicesPath
	}		}
	return "product-services"		return "product_services"
	}		}

	func (c *deviceConfig) BtConfigIncludeDir() string {		func (c *deviceConfig) BtConfigIncludeDir() string {

android/module.go

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -243,9 +243,9 @@ type commonProperties struct {
	Product_specific *bool		Product_specific *bool

	// whether this module provides services owned by the OS provider to the core platform. When set		// 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		// to true, it is installed into /product_services (or /system/product_services if
	// product-services partition does not exist).		// product_services partition does not exist).
	ProductServices_specific *bool		Product_services_specific *bool

	// Whether this module is installed to recovery partition		// Whether this module is installed to recovery partition
	Recovery *bool		Recovery *bool
	@@ -548,7 +548,7 @@ func (a *ModuleBase) ProductSpecific() bool {
	}		}

	func (a *ModuleBase) ProductServicesSpecific() bool {		func (a *ModuleBase) ProductServicesSpecific() bool {
	return Bool(a.commonProperties.ProductServices_specific)		return Bool(a.commonProperties.Product_services_specific)
	}		}

	func (a *ModuleBase) Enabled() bool {		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 socSpecific = Bool(a.commonProperties.Vendor) \|\| Bool(a.commonProperties.Proprietary) \|\| Bool(a.commonProperties.Soc_specific)
	var deviceSpecific = Bool(a.commonProperties.Device_specific)		var deviceSpecific = Bool(a.commonProperties.Device_specific)
	var productSpecific = Bool(a.commonProperties.Product_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"		msg := "conflicting value set here"
	if socSpecific && deviceSpecific {		if socSpecific && deviceSpecific {

android/paths_test.go

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -293,7 +293,7 @@ func TestPathForModuleInstall(t *testing.T) {
	out: "target/product/test_device/product/bin/my_test",		out: "target/product/test_device/product/bin/my_test",
	},		},
	{		{
	name: "product-services binary",		name: "product_services binary",
	ctx: &moduleInstallPathContextImpl{		ctx: &moduleInstallPathContextImpl{
	androidBaseContextImpl: androidBaseContextImpl{		androidBaseContextImpl: androidBaseContextImpl{
	target: deviceTarget,		target: deviceTarget,
	@@ -301,7 +301,7 @@ func TestPathForModuleInstall(t *testing.T) {
	},		},
	},		},
	in: []string{"bin", "my_test"},		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 @@ func TestPathForModuleInstall(t *testing.T) {
	},		},

	{		{
	name: "product-services native test binary",		name: "product_services native test binary",
	ctx: &moduleInstallPathContextImpl{		ctx: &moduleInstallPathContextImpl{
	androidBaseContextImpl: androidBaseContextImpl{		androidBaseContextImpl: androidBaseContextImpl{
	target: deviceTarget,		target: deviceTarget,
	@@ -414,7 +414,7 @@ func TestPathForModuleInstall(t *testing.T) {
	},		},

	{		{
	name: "sanitized product-services binary",		name: "sanitized product_services binary",
	ctx: &moduleInstallPathContextImpl{		ctx: &moduleInstallPathContextImpl{
	androidBaseContextImpl: androidBaseContextImpl{		androidBaseContextImpl: androidBaseContextImpl{
	target: deviceTarget,		target: deviceTarget,
	@@ -423,7 +423,7 @@ func TestPathForModuleInstall(t *testing.T) {
	inSanitizerDir: true,		inSanitizerDir: true,
	},		},
	in: []string{"bin", "my_test"},		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 @@ func TestPathForModuleInstall(t *testing.T) {
	out: "target/product/test_device/data/asan/data/nativetest/my_test",		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{		ctx: &moduleInstallPathContextImpl{
	androidBaseContextImpl: androidBaseContextImpl{		androidBaseContextImpl: androidBaseContextImpl{
	target: deviceTarget,		target: deviceTarget,

ui/build/cleanbuild.go

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -108,7 +108,7 @@ func installClean(ctx Context, config Config, what int) {
	productOut("system_other"),		productOut("system_other"),
	productOut("vendor"),		productOut("vendor"),
	productOut("product"),		productOut("product"),
	productOut("product-services"),		productOut("product_services"),
	productOut("oem"),		productOut("oem"),
	productOut("obj/FAKE"),		productOut("obj/FAKE"),
	productOut("breakpad"),		productOut("breakpad"),