diff options
| author | 2022-05-19 20:46:23 +0000 | |
|---|---|---|
| committer | 2022-05-19 20:46:23 +0000 | |
| commit | 6c04c66b7e305144bf6347b6d2422935a1b46bc1 (patch) | |
| tree | 881f5b84c830d6519c284ac7a6f40f309e257de5 /java/java.go | |
| parent | 754edfa660ef83f32d1f0daa7da5785e1e960056 (diff) | |
| parent | 61df14acce0c642f18730eefff5ebd20ee1463dc (diff) | |
Merge "Don't call dexpreopter methods on host modules"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/java/java.go b/java/java.go index 079d4b9e7..4476cec3e 100644 --- a/java/java.go +++ b/java/java.go @@ -592,12 +592,14 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { } j.checkSdkVersions(ctx) - j.dexpreopter.installPath = j.dexpreopter.getInstallPath( - ctx, android.PathForModuleInstall(ctx, "framework", j.Stem()+".jar")) - j.dexpreopter.isSDKLibrary = j.deviceProperties.IsSDKLibrary - setUncompressDex(ctx, &j.dexpreopter, &j.dexer) - j.dexpreopter.uncompressedDex = *j.dexProperties.Uncompress_dex - j.classLoaderContexts = j.usesLibrary.classLoaderContextForUsesLibDeps(ctx) + if ctx.Device() { + j.dexpreopter.installPath = j.dexpreopter.getInstallPath( + ctx, android.PathForModuleInstall(ctx, "framework", j.Stem()+".jar")) + j.dexpreopter.isSDKLibrary = j.deviceProperties.IsSDKLibrary + setUncompressDex(ctx, &j.dexpreopter, &j.dexer) + j.dexpreopter.uncompressedDex = *j.dexProperties.Uncompress_dex + j.classLoaderContexts = j.usesLibrary.classLoaderContextForUsesLibDeps(ctx) + } j.compile(ctx, nil) // Collect the module directory for IDE info in java/jdeps.go. |