diff options
| author | 2019-05-29 20:28:47 +0000 | |
|---|---|---|
| committer | 2019-05-29 20:28:47 +0000 | |
| commit | c03249833603dc57617ec603d7939fce621c474c (patch) | |
| tree | 53fc8acabdb8c09874933db962ac1ff450829d05 /java/dexpreopt.go | |
| parent | b66d7b1c20f7e54a5920780ba6643e971d216d31 (diff) | |
Revert "Port uses-shared library verification and dexpreopting to Soong"
This reverts commit b66d7b1c20f7e54a5920780ba6643e971d216d31.
Reason for revert: broke unbundled builds
Change-Id: I96ae287885107079de4a26e6b100ad8ed66961c0
Diffstat (limited to 'java/dexpreopt.go')
| -rw-r--r-- | java/dexpreopt.go | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/java/dexpreopt.go b/java/dexpreopt.go index 23d2aa6e3..08fd06ed6 100644 --- a/java/dexpreopt.go +++ b/java/dexpreopt.go @@ -29,12 +29,6 @@ type dexpreopter struct { isInstallable bool isPresignedPrebuilt bool - manifestFile android.Path - usesLibs []string - optionalUsesLibs []string - enforceUsesLibs bool - libraryPaths map[string]android.Path - builtInstalled string } @@ -160,7 +154,6 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo DexLocation: dexLocation, BuildPath: android.PathForModuleOut(ctx, "dexpreopt", ctx.ModuleName()+".jar").OutputPath, DexPath: dexJarFile, - ManifestPath: d.manifestFile, UncompressedDex: d.uncompressedDex, HasApkLibraries: false, PreoptFlags: nil, @@ -168,10 +161,10 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo ProfileClassListing: profileClassListing, ProfileIsTextListing: profileIsTextListing, - EnforceUsesLibraries: d.enforceUsesLibs, - PresentOptionalUsesLibraries: d.optionalUsesLibs, - UsesLibraries: d.usesLibs, - LibraryPaths: d.libraryPaths, + EnforceUsesLibraries: false, + OptionalUsesLibraries: nil, + UsesLibraries: nil, + LibraryPaths: nil, Archs: archs, DexPreoptImages: images, |