diff options
| author | 2021-08-19 09:14:33 +0000 | |
|---|---|---|
| committer | 2021-08-19 09:14:33 +0000 | |
| commit | abcce6f1c3714ea06b01796a453057535635a83f (patch) | |
| tree | 511e591fe048d65ecafaf001e114ee26d47bfc5c /java/java.go | |
| parent | 1c700090e9cccd7ec131e97121add177da2dd56d (diff) | |
| parent | e4432874a9bc69b4f54a0cab1e7df8f1d57432d0 (diff) | |
Merge "Propagate <uses-library> dependencies from `java_library` to apps."
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 5bf3d79fb..b46324f9f 100644 --- a/java/java.go +++ b/java/java.go @@ -511,7 +511,7 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.dexProperties.Uncompress_dex = proptools.BoolPtr(shouldUncompressDex(ctx, &j.dexpreopter)) } j.dexpreopter.uncompressedDex = *j.dexProperties.Uncompress_dex - j.classLoaderContexts = make(dexpreopt.ClassLoaderContextMap) + j.classLoaderContexts = j.usesLibrary.classLoaderContextForUsesLibDeps(ctx) j.compile(ctx, nil) // Collect the module directory for IDE info in java/jdeps.go. @@ -530,6 +530,7 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { func (j *Library) DepsMutator(ctx android.BottomUpMutatorContext) { j.deps(ctx) + j.usesLibrary.deps(ctx, false) } const ( |