Merge "Remove TARGET_PREFER_32_BIT support." am: a82ad479a4 am: 274a80c492

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1289612

Change-Id: I8862a464aa374922dadedd68e47d1705b8ce5836
This commit is contained in:
Elliott Hughes
2020-06-10 18:36:54 +00:00
committed by Automerger Merge Worker
7 changed files with 3 additions and 32 deletions

View File

@@ -987,10 +987,6 @@ func AndroidAppFactory() android.Module {
&module.overridableAppProperties,
&module.usesLibrary.usesLibraryProperties)
module.Prefer32(func(ctx android.BaseModuleContext, base *android.ModuleBase, class android.OsClass) bool {
return class == android.Device && ctx.Config().DevicePrefer32BitApps()
})
android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon)
android.InitDefaultableModule(module)
android.InitOverridableModule(module, &module.appProperties.Overrides)