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

dex_import that isn't available for platform isn't installed

Browse Source 
This change fixes a bug that dex_import module is always installed to
the platform even when the module is not available to the platform.

Bug: 158284983
Test: OUT_DIR=/tmp/ndk build/soong/scripts/build-ndk-prebuilts.sh
Change-Id: I85570506e700be59ee63e4f1d7902a40e36df39c
This commit is contained in:
Jiyong Park
2020-06-08 19:24:09 +09:00
parent 0011ebcd34
commit afd3d11a79
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java.go
View File

@@ -2741,9 +2741,11 @@ func (j *DexImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {
j.maybeStrippedDexJarFile = dexOutputFile j.maybeStrippedDexJarFile = dexOutputFile
if j.IsForPlatform() {
ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"), ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"),
j.Stem()+".jar", dexOutputFile) j.Stem()+".jar", dexOutputFile)
} }
}
func (j *DexImport) DexJar() android.Path { func (j *DexImport) DexJar() android.Path {
return j.dexJarFile return j.dexJarFile