diff options
| author | 2024-10-07 18:39:06 +0000 | |
|---|---|---|
| committer | 2024-10-07 18:39:06 +0000 | |
| commit | b67040dedebe995243cd1db9e4785043b413b49d (patch) | |
| tree | bda779e49136ab6e80caa23bea10c8ca9dda9512 /java/base.go | |
| parent | e960ab62a4b146a73864991bac4bba582960e19b (diff) | |
[Ravenwood] Run Ravenizer on resource jars
Bug: 292141694
Flag: EXEMPT host test change only
Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh
Change-Id: Ia84a40a390e83e0ab297cbcc8261d19603003649
Diffstat (limited to 'java/base.go')
| -rw-r--r-- | java/base.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/java/base.go b/java/base.go index fc21c44e5..7a957350a 100644 --- a/java/base.go +++ b/java/base.go @@ -1628,7 +1628,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath if j.ravenizer.enabled { ravenizerInput := outputFile - ravenizerOutput := android.PathForModuleOut(ctx, "ravenizer", jarName) + ravenizerOutput := android.PathForModuleOut(ctx, "ravenizer", "", jarName) ravenizerArgs := "" if proptools.Bool(j.properties.Ravenizer.Strip_mockito) { ravenizerArgs = "--strip-mockito" @@ -1637,6 +1637,14 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath outputFile = ravenizerOutput localImplementationJars = android.Paths{ravenizerOutput} completeStaticLibsImplementationJars = android.NewDepSet(android.PREORDER, localImplementationJars, nil) + if combinedResourceJar != nil { + ravenizerInput = combinedResourceJar + ravenizerOutput = android.PathForModuleOut(ctx, "ravenizer", "resources", jarName) + TransformRavenizer(ctx, ravenizerOutput, ravenizerInput, ravenizerArgs) + combinedResourceJar = ravenizerOutput + localResourceJars = android.Paths{ravenizerOutput} + completeStaticLibsResourceJars = android.NewDepSet(android.PREORDER, localResourceJars, nil) + } } if j.shouldApiMapper() { |