Merge "Fix using defaults in android_app and android_test modules"

am: 06e36c737f

Change-Id: I3ea743126187f5df9b37db55d9e77ac50d2cdafb
This commit is contained in:
Colin Cross
2018-08-20 15:30:48 -07:00
committed by android-build-merger

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
}