Move autogenerated rro creation to a higher priority load hook
This prevents issues where the autogenerated rro module depends on a
module that has been disabled using soong config variables
Test: Added a unit test
Change-Id: Iaaa9803d136dd720a67b6f87c25913d82c723214
diff --git a/java/app.go b/java/app.go
index 34884d7..7bb51e4 100644
--- a/java/app.go
+++ b/java/app.go
@@ -1783,9 +1783,9 @@
android.InitAndroidMultiTargetsArchModule(m, android.DeviceSupported, android.MultilibCommon)
android.InitOverrideModule(m)
- android.AddLoadHook(m, func(ctx android.LoadHookContext) {
+ android.AddLoadHookWithPriority(m, func(ctx android.LoadHookContext) {
createInternalRuntimeOverlays(ctx, m.ModuleBase)
- })
+ }, 1) // Run after soong config load hoook
return m
}