From b6b89a40741fbc9a043f3dcc348f111b000de1a7 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Thu, 6 May 2021 16:33:43 +0100
Subject: [PATCH] Add missing calls to InitSdkAwareModule

A follow up change will add methods to SdkBase which requires its
module field to have been initialized.

Bug: 181569894
Test: m nothing
Change-Id: I9b02f260ad3f82316cc7ab3b5717b7e81090b0d8
---
 java/java.go           | 2 ++
 java/sdk_library.go    | 1 +
 java/system_modules.go | 1 +
 3 files changed, 4 insertions(+)

diff --git a/java/java.go b/java/java.go
index 7258dcefd..cfbe4b07c 100644
--- a/java/java.go
+++ b/java/java.go
@@ -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
 }
diff --git a/java/sdk_library.go b/java/sdk_library.go
index fcc105d56..e6f41d056 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -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.
diff --git a/java/system_modules.go b/java/system_modules.go
index a09778cd0..473838541 100644
--- a/java/system_modules.go
+++ b/java/system_modules.go
@@ -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
 }