Merge "Fix using defaults in android_app and android_test modules" am: 06e36c737f

am: 777eeb5556

Change-Id: If3558b51f882ae1580cfce30c6ef1eb09d77d102
This commit is contained in:
Colin Cross
2018-08-20 15:34:51 -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
}