diff options
| author | 2020-10-08 12:53:58 +0100 | |
|---|---|---|
| committer | 2020-11-16 14:59:07 +0000 | |
| commit | b23d28c6e25aeeefa52f6d2569970be2a6de222c (patch) | |
| tree | f506dcc183bde40758e4b2cd7f532802370d04b3 /java/android_manifest.go | |
| parent | a8c28e27bc60e7f595def374edd2c7b1e1516b77 (diff) | |
Rename fields and methods to reflect class loader context changes.
Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 132357300
Change-Id: Iebfbf2ffdac5ee48476d2aac312b3b8f4471fc85
Diffstat (limited to 'java/android_manifest.go')
| -rw-r--r-- | java/android_manifest.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/android_manifest.go b/java/android_manifest.go index 6b39c3584..c76bb2fda 100644 --- a/java/android_manifest.go +++ b/java/android_manifest.go @@ -44,7 +44,7 @@ var manifestMergerRule = pctx.AndroidStaticRule("manifestMerger", // Uses manifest_fixer.py to inject minSdkVersion, etc. into an AndroidManifest.xml func manifestFixer(ctx android.ModuleContext, manifest android.Path, sdkContext sdkContext, - sdkLibraries dexpreopt.ClassLoaderContextMap, isLibrary, useEmbeddedNativeLibs, usesNonSdkApis, + classLoaderContexts dexpreopt.ClassLoaderContextMap, isLibrary, useEmbeddedNativeLibs, usesNonSdkApis, useEmbeddedDex, hasNoCode bool, loggingParent string) android.Path { var args []string @@ -71,7 +71,7 @@ func manifestFixer(ctx android.ModuleContext, manifest android.Path, sdkContext args = append(args, "--use-embedded-dex") } - for _, usesLib := range sdkLibraries.UsesLibs() { + for _, usesLib := range classLoaderContexts.UsesLibs() { if inList(usesLib, dexpreopt.OptionalCompatUsesLibs) { args = append(args, "--optional-uses-library", usesLib) } else { |