Merge "dex_import that isn't available for platform isn't installed" am: d4873a6b68

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

Change-Id: I1c70a39543d6edfef383464ae70e2d19518179b2
This commit is contained in:
Jiyong Park 2020-06-09 23:21:45 +00:00 committed by Automerger Merge Worker
commit ebccc4ddf5

View file

@ -2754,8 +2754,10 @@ func (j *DexImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {
j.maybeStrippedDexJarFile = dexOutputFile
ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"),
j.Stem()+".jar", dexOutputFile)
if j.IsForPlatform() {
ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"),
j.Stem()+".jar", dexOutputFile)
}
}
func (j *DexImport) DexJarBuildPath() android.Path {