Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ea28aef authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove unused "product_services_specific" prop"

parents d006779e 43240b11

android/androidmk.go

+0 −3
Original line number Diff line number Diff line
@@ -230,9 +230,6 @@ func (a *AndroidMkEntries) fillInEntries(config Config, bpPath string, mod bluep 
		}

		a.SetBoolIfTrue("LOCAL_ODM_MODULE", Bool(amod.commonProperties.Device_specific))

		a.SetBoolIfTrue("LOCAL_PRODUCT_MODULE", Bool(amod.commonProperties.Product_specific))

		// TODO(b/135957588) product_services_specific is matched to LOCAL_PRODUCT_MODULE

		// as a workaround. Remove this after clearing all Android.bp

		a.SetBoolIfTrue("LOCAL_PRODUCT_MODULE", Bool(amod.commonProperties.Product_services_specific))

		a.SetBoolIfTrue("LOCAL_SYSTEM_EXT_MODULE", Bool(amod.commonProperties.System_ext_specific))

		if amod.commonProperties.Owner != nil {

			a.SetString("LOCAL_MODULE_OWNER", *amod.commonProperties.Owner)

android/module.go

+0 −5
Original line number Diff line number Diff line
@@ -365,11 +365,6 @@ type commonProperties struct { 
	// /system/product if product partition does not exist).

	Product_specific *bool



	// TODO(b/135957588) Product_services_specific will be removed once we clear all Android.bp

	// files that have 'product_services_specific: true'. This will be converted to

	// Product_speicific as a workaround.

	Product_services_specific *bool



	// whether this module extends system. When set to true, it is installed into /system_ext

	// (or /system/system_ext if system_ext partition does not exist).

	System_ext_specific *bool