diff options
| author | 2019-01-22 07:48:05 +0000 | |
|---|---|---|
| committer | 2019-01-22 07:48:05 +0000 | |
| commit | f8c06c159e8ba3fa7afdc263d72f91cbd50a9e36 (patch) | |
| tree | 535466172a4f6787bffa6b9473d176051740700e /java | |
| parent | 5c7c78a2e0a1a00cd0bdf7759af8a43e2a4ccac2 (diff) | |
| parent | 4bdea39ad2fb3cf3ba26a931fa6e81a29c9257d4 (diff) | |
Merge "Don't install java libraries that are already in an apex."
Diffstat (limited to 'java')
| -rw-r--r-- | java/androidmk.go | 3 | ||||
| -rw-r--r-- | java/java.go | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index b9e429894..ccb510907 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -33,9 +33,6 @@ func (library *Library) AndroidMkHostDex(w io.Writer, name string, data android. } else { fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", library.implementationAndResourcesJar.String()) } - if library.installFile == nil { - fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := true") - } if library.dexJarFile != nil { fmt.Fprintln(w, "LOCAL_SOONG_DEX_JAR :=", library.dexJarFile.String()) } diff --git a/java/java.go b/java/java.go index 9c4bd869e..7e82c59d6 100644 --- a/java/java.go +++ b/java/java.go @@ -1395,7 +1395,7 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.deviceProperties.UncompressDex = j.shouldUncompressDex(ctx) j.compile(ctx) - if Bool(j.properties.Installable) || ctx.Host() { + if (Bool(j.properties.Installable) || ctx.Host()) && !android.DirectlyInAnyApex(ctx, ctx.ModuleName()) { if j.deviceProperties.UncompressDex { alignedOutputFile := android.PathForModuleOut(ctx, "aligned", ctx.ModuleName()+".jar") TransformZipAlign(ctx, alignedOutputFile, j.outputFile) |