diff options
| -rw-r--r-- | java/app_import.go | 8 | ||||
| -rw-r--r-- | java/app_test.go | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/java/app_import.go b/java/app_import.go index 59eb10a9b..d69dd10f9 100644 --- a/java/app_import.go +++ b/java/app_import.go @@ -244,10 +244,6 @@ func (a *AndroidAppImport) generateAndroidBuildActions(ctx android.ModuleContext srcApk := a.prebuilt.SingleSourcePath(ctx) - if a.usesLibrary.enforceUsesLibraries() { - srcApk = a.usesLibrary.verifyUsesLibrariesAPK(ctx, srcApk) - } - // TODO: Install or embed JNI libraries // Uncompress JNI libraries in the apk @@ -276,6 +272,10 @@ func (a *AndroidAppImport) generateAndroidBuildActions(ctx android.ModuleContext a.dexpreopter.enforceUsesLibs = a.usesLibrary.enforceUsesLibraries() a.dexpreopter.classLoaderContexts = a.usesLibrary.classLoaderContextForUsesLibDeps(ctx) + if a.usesLibrary.enforceUsesLibraries() { + srcApk = a.usesLibrary.verifyUsesLibrariesAPK(ctx, srcApk) + } + a.dexpreopter.dexpreopt(ctx, jnisUncompressed) if a.dexpreopter.uncompressedDex { dexUncompressed := android.PathForModuleOut(ctx, "dex-uncompressed", ctx.ModuleName()+".apk") diff --git a/java/app_test.go b/java/app_test.go index de06c294c..cb194888f 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -2335,9 +2335,7 @@ 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 - // TODO(b/132357300): "non-sdk-lib" should not be here - // TODO(b/132357300): "com.non.sdk.lib" should be here - verifyApkReqLibs := `uses_library_names="foo non-sdk-lib android.test.runner"` + 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) |