From 3b19f5d71dbdbbf79a211f40ccfd39f42f2bc7ec Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 17 Sep 2019 14:45:31 -0700 Subject: Remove old-style support for translated second architectures Translated second architectures now go in NativeBridgeArch instead of DeviceSecondaryArch. This reapplies I568046330abc002d4eed582cb999b62a5eaba790 with ctx.Config().HasMulitlibConflict() added to fix the NDK build, which has arm64, arm, x86_64, and x86 architectures enabled. Test: m checkbuild Test: OUT_DIR=out_ndk build/soong/scripts/build-ndk-prebuilts.sh Test: no change to build.ninja or Android-aosp_cf_x86_phone.mk Change-Id: Iadcafbd64bfb9579ae7c86914927c43a062b0c8e --- java/dexpreopt.go | 4 ---- 1 file changed, 4 deletions(-) (limited to 'java/dexpreopt.go') diff --git a/java/dexpreopt.go b/java/dexpreopt.go index 6214dac44..8bc9b19ad 100644 --- a/java/dexpreopt.go +++ b/java/dexpreopt.go @@ -126,10 +126,6 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo archs = archs[:1] } } - if ctx.Config().SecondArchIsTranslated() { - // Only preopt primary arch for translated arch since there is only an image there. - archs = archs[:1] - } var images android.Paths var imagesDeps []android.Paths -- cgit v1.2.3-59-g8ed1b