Fix using defaults in android_app and android_test modules

android_app and android_test modules weren't getting
InitDefaultableModule called on them.  Call InitJavaModule
which does both InitAndroidArchModule and InitDefaultableModule.

Test: m checkbuild
Change-Id: I26f3c04ea8bdfcacb59dcdbc63d6db5604c2598a
This commit is contained in:
Colin Cross 2018-08-20 13:28:12 -07:00
parent 91606c016e
commit b98c0f4c7d

View file

@ -208,7 +208,7 @@ func AndroidAppFactory() android.Module {
&module.aaptProperties,
&module.appProperties)
android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
InitJavaModule(module, android.DeviceSupported)
return module
}
@ -261,7 +261,6 @@ func AndroidTestFactory() android.Module {
&module.appTestProperties,
&module.testProperties)
android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
InitJavaModule(module, android.DeviceSupported)
return module
}