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

Commit 55ebae11 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Automerger Merge Worker
Browse files

Merge "Make all the PrebuiltEtc modules defaultable." am: 1e78f581 am:... 

Merge "Make all the PrebuiltEtc modules defaultable." am: 1e78f581 am: c651c169 am: ccf24516 am: ef934687

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1856366

Change-Id: I92e4a8ef9eea38a4759933a801183bcfb069fcd8
parents 0a97d7ba ef934687

etc/prebuilt_etc.go

+8 −0
Original line number Diff line number Diff line
@@ -439,6 +439,7 @@ func PrebuiltEtcHostFactory() android.Module { 
	InitPrebuiltEtcModule(module, "etc")

	// This module is host-only

	android.InitAndroidArchModule(module, android.HostSupported, android.MultilibCommon)

	android.InitDefaultableModule(module)

	return module

}
@@ -449,6 +450,7 @@ func PrebuiltRootFactory() android.Module { 
	InitPrebuiltRootModule(module)

	// This module is device-only

	android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibFirst)

	android.InitDefaultableModule(module)

	return module

}
@@ -459,6 +461,7 @@ func PrebuiltUserShareFactory() android.Module { 
	InitPrebuiltEtcModule(module, "usr/share")

	// This module is device-only

	android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibFirst)

	android.InitDefaultableModule(module)

	return module

}
@@ -469,6 +472,7 @@ func PrebuiltUserShareHostFactory() android.Module { 
	InitPrebuiltEtcModule(module, "usr/share")

	// This module is host-only

	android.InitAndroidArchModule(module, android.HostSupported, android.MultilibCommon)

	android.InitDefaultableModule(module)

	return module

}
@@ -478,6 +482,7 @@ func PrebuiltFontFactory() android.Module { 
	InitPrebuiltEtcModule(module, "fonts")

	// This module is device-only

	android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibFirst)

	android.InitDefaultableModule(module)

	return module

}
@@ -491,6 +496,7 @@ func PrebuiltFirmwareFactory() android.Module { 
	InitPrebuiltEtcModule(module, "etc/firmware")

	// This module is device-only

	android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibFirst)

	android.InitDefaultableModule(module)

	return module

}
@@ -503,6 +509,7 @@ func PrebuiltDSPFactory() android.Module { 
	InitPrebuiltEtcModule(module, "etc/dsp")

	// This module is device-only

	android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibFirst)

	android.InitDefaultableModule(module)

	return module

}
@@ -516,6 +523,7 @@ func PrebuiltRFSAFactory() android.Module { 
	InitPrebuiltEtcModule(module, "lib/rfsa")

	// This module is device-only

	android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibFirst)

	android.InitDefaultableModule(module)

	return module

}