From 01bca755aed51ea681dbd2cf8237c7173f2cc30a Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Mon, 8 Jun 2020 19:24:09 +0900
Subject: dex_import that isn't available for platform isn't installed

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.

Exempt-From-Owner-Approval: cherry-pick from AOSP

Bug: 158284983
Test: OUT_DIR=/tmp/ndk build/soong/scripts/build-ndk-prebuilts.sh
Merged-In: I85570506e700be59ee63e4f1d7902a40e36df39c
(cherry picked from commit afd3d11a795b9f331637d3587a94142f20e8c55d)
Change-Id: I85570506e700be59ee63e4f1d7902a40e36df39c
---
 java/java.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'java/java.go')

diff --git a/java/java.go b/java/java.go
index 0ba1f5a7a..ee4b8d89b 100644
--- a/java/java.go
+++ b/java/java.go
@@ -2753,8 +2753,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 {
-- 
cgit v1.2.3