Commit 9448e8fd authored Sep 14, 2020 by Victor Chang Committed by Colin Cross Feb 17, 2021

Add first_perfer32 option to compile_multilib

NDK has 4 ABIs, i.e. x86, x86_64, armv7-a, armv8-a, but cintltst
can only compiled into single ABI, or otherwise, the java_test_host
CtsIcu4cTestCases can't include cintltst in the "data" property
because the "data" property can only include dependecies with
a single variant/ABI.

CtsIcu4cTestCases needs to use "data" property instead of
"host_required" dependency because "host_required" relationship
does not work for streaming the "general_tests" in the post-submit
infra-strucuture. See https://r.android.com/1175350 for the details.

Bug: 168445204
Bug: 160350521
Test: OUT_DIR=ndk_out build/soong/scripts/build-ndk-prebuilts.sh
Change-Id: I81429cc261ec4e25aefe363abb099048ff026505

parent a1751260

android/arch.go

+3 −1

Original line number	Diff line number	Diff line
		@@ -1609,13 +1609,15 @@ func decodeMultilibTargets(multilib string, targets []Target, prefer32 bool) ([]
		} else {
		buildTargets = firstTarget(targets, "lib64", "lib32")
		}
		case "first_prefer32":
		buildTargets = firstTarget(targets, "lib32", "lib64")
		case "prefer32":
		buildTargets = filterMultilibTargets(targets, "lib32")
		if len(buildTargets) == 0 {
		buildTargets = filterMultilibTargets(targets, "lib64")
		}
		default:
		return nil, fmt.Errorf(`compile_multilib must be "both", "first", "32", "64", or "prefer32" found %q`,
		return nil, fmt.Errorf(`compile_multilib must be "both", "first", "32", "64", "prefer32" or "first_prefer32" found %q`,
		multilib)
		}