From 0aba252e157457143b455511f1f811107015c3c1 Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Wed, 3 Mar 2021 16:38:37 +0000 Subject: Reimplement verify_uses_libraries.sh in manifest_check.py. Previously there were two different scripts that did similar things: 1) build/soong/scripts/manifest_check.py 2) build/make/core/verify_uses_libraries.sh Both scripts extracted tags and `targetSdkVersion` from the manifests of Java modules, but 1) worked for XML manifests, and 2) worked for APKs. This CL reimplements the functionality from 2) in 1), so that one script can handle both XML manifests and APKs. Bug: 132357300 Test: lunch cf_x86_64_phone-userdebug && m && launch_cvd \ adb wait-for-device && adb root && adb logcat \ | grep -E 'ClassLoaderContext [a-z ]+ mismatch' # empty grep output, no errors Change-Id: Id1b66e4f3f30f307dba70cb111c7571762cb546a --- java/app_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'java/app_test.go') diff --git a/java/app_test.go b/java/app_test.go index 78e1a57a9..040ca1925 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -2405,13 +2405,13 @@ func TestUsesLibraries(t *testing.T) { // Test that all libraries are verified for an APK (library order matters). verifyApkCmd := prebuilt.Rule("verify_uses_libraries").RuleParams.Command - verifyApkReqLibs := `uses_library_names="foo com.non.sdk.lib android.test.runner"` - verifyApkOptLibs := `optional_uses_library_names="bar baz"` - if !strings.Contains(verifyApkCmd, verifyApkReqLibs) { - t.Errorf("wanted %q in %q", verifyApkReqLibs, verifyApkCmd) - } - if !strings.Contains(verifyApkCmd, verifyApkOptLibs) { - t.Errorf("wanted %q in %q", verifyApkOptLibs, verifyApkCmd) + verifyApkArgs := `--uses-library foo ` + + `--uses-library com.non.sdk.lib ` + + `--uses-library android.test.runner ` + + `--optional-uses-library bar ` + + `--optional-uses-library baz ` + if !strings.Contains(verifyApkCmd, verifyApkArgs) { + t.Errorf("wanted %q in %q", verifyApkArgs, verifyApkCmd) } // Test that all present libraries are preopted, including implicit SDK dependencies, possibly stubs -- cgit v1.2.3-59-g8ed1b