diff options
| author | Jiyong Park <jiyong@google.com> | 2020-06-09 23:02:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-06-09 23:02:10 +0000 |
| commit | d4873a6b6899f5a3cb159a9376938cf5a8afb7b1 (patch) | |
| tree | e17bb6c229c6861da9ddeda29c363f508d47781d /java/java.go | |
| parent | bf488e10e80594460f9be217ffac0057bf2f748e (diff) | |
| parent | 01bca755aed51ea681dbd2cf8237c7173f2cc30a (diff) | |
Merge "dex_import that isn't available for platform isn't installed"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index af68e56b7..226e0b91b 100644 --- a/java/java.go +++ b/java/java.go @@ -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 { |