StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't call dexpreopter methods on host modules" am: 6c04c66b7e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1908174

Change-Id: Ic826a4d3dff2b9a8efbb31421bfca1a3e4484440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2022-05-19 20:53:28 +00:00
committed by Automerger Merge Worker
parent c05fce0836 6c04c66b7e
commit e00639d4ba
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/java.go
View File

@@ -592,12 +592,14 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) {
} }
j.checkSdkVersions(ctx) j.checkSdkVersions(ctx)
j.dexpreopter.installPath = j.dexpreopter.getInstallPath( if ctx.Device() {
ctx, android.PathForModuleInstall(ctx, "framework", j.Stem()+".jar")) j.dexpreopter.installPath = j.dexpreopter.getInstallPath(
j.dexpreopter.isSDKLibrary = j.deviceProperties.IsSDKLibrary ctx, android.PathForModuleInstall(ctx, "framework", j.Stem()+".jar"))
setUncompressDex(ctx, &j.dexpreopter, &j.dexer) j.dexpreopter.isSDKLibrary = j.deviceProperties.IsSDKLibrary
j.dexpreopter.uncompressedDex = *j.dexProperties.Uncompress_dex setUncompressDex(ctx, &j.dexpreopter, &j.dexer)
j.classLoaderContexts = j.usesLibrary.classLoaderContextForUsesLibDeps(ctx) j.dexpreopter.uncompressedDex = *j.dexProperties.Uncompress_dex
j.classLoaderContexts = j.usesLibrary.classLoaderContextForUsesLibDeps(ctx)
}
j.compile(ctx, nil) j.compile(ctx, nil)
// Collect the module directory for IDE info in java/jdeps.go. // Collect the module directory for IDE info in java/jdeps.go.