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

Commit 33334e65 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Add missing calls to InitSdkAwareModule" am: 820ed789 am: c74ff5ca 

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

Change-Id: I4bf1ee3640bab68d7c38079e71eec25f212a84c3
parents 85e40bba c74ff5ca

java/java.go

+2 −0
Original line number Diff line number Diff line
@@ -669,6 +669,7 @@ func LibraryHostFactory() android.Module { 
	module.Module.properties.Installable = proptools.BoolPtr(true)



	android.InitApexModule(module)

	android.InitSdkAwareModule(module)

	InitJavaModule(module, android.HostSupported)

	return module

}
@@ -923,6 +924,7 @@ func TestFactory() android.Module { 
	module.Module.dexpreopter.isTest = true

	module.Module.linter.test = true



	android.InitSdkAwareModule(module)

	InitJavaModule(module, android.HostAndDeviceSupported)

	return module

}

java/sdk_library.go

+1 −0
Original line number Diff line number Diff line
@@ -1756,6 +1756,7 @@ func SdkLibraryFactory() android.Module { 


	module.InitSdkLibraryProperties()

	android.InitApexModule(module)

	android.InitSdkAwareModule(module)

	InitJavaModule(module, android.HostAndDeviceSupported)



	// Initialize the map from scope to scope specific properties.

java/system_modules.go

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ func SystemModulesFactory() android.Module { 
	module.AddProperties(&module.properties)

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

	android.InitDefaultableModule(module)

	android.InitSdkAwareModule(module)

	return module

}