Fix use_embedded_native_libs handling for android_test
`use_embedded_native_libs: true` should cause
`--extract-native-libs=false` be added to the manifest_fixer invocation,
and it was not happening.
There are also minor naming improvements.
Bug: 117618214
Test: treehugger and 'atest CtsDynamicLinkerTestCases' after
cts/tests/tests/dynamic_linker has been converted to Android.bp.
Change-Id: I93ec2aed3f3b185d320e56b1b4eebb71339b81ee
diff --git a/java/aar.go b/java/aar.go
index 6d40a8a..5e1f88e 100644
--- a/java/aar.go
+++ b/java/aar.go
@@ -81,7 +81,7 @@
extraAaptPackagesFile android.Path
mergedManifestFile android.Path
isLibrary bool
- uncompressedJNI bool
+ useEmbeddedNativeLibs bool
useEmbeddedDex bool
usesNonSdkApis bool
@@ -201,7 +201,7 @@
manifestSrcPath := android.PathForModuleSrc(ctx, manifestFile)
manifestPath := manifestFixer(ctx, manifestSrcPath, sdkContext,
- a.isLibrary, a.uncompressedJNI, a.usesNonSdkApis, a.useEmbeddedDex)
+ a.isLibrary, a.useEmbeddedNativeLibs, a.usesNonSdkApis, a.useEmbeddedDex)
a.transitiveManifestPaths = append(android.Paths{manifestPath}, transitiveStaticLibManifests...)