diff options
| author | Colin Cross <ccross@android.com> | 2018-10-15 16:18:06 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-10-18 23:54:38 +0000 |
| commit | 4b964c00a6f114a85cf13ef825e72df25985f8e6 (patch) | |
| tree | bf42766bf69b4ecc7cb40158b3403569bbb46bc8 /java/dex.go | |
| parent | 78e3cb096bc82bc5a92eb112faf6c0f5411431d2 (diff) | |
| download | build_soong-4b964c00a6f114a85cf13ef825e72df25985f8e6.tar.gz build_soong-4b964c00a6f114a85cf13ef825e72df25985f8e6.tar.bz2 build_soong-4b964c00a6f114a85cf13ef825e72df25985f8e6.zip | |
Fix instrumentation_for to match LOCAL_INSTRUMENTATION_FOR
The value from instrumentation_for should not go to
aapt2 link --rename-instrumentation-target-package, that should
be the equivalent of LOCAL_MANIFEST_INSTRUMENTATION_FOR. That
property is never used in Make, so it is left unimplemented in
Soong.
Add the module listed in instrumentation_for as a shared library
for javac, but don't import its resources.
Bug: 117804211
Test: m checkbuild
Change-Id: I7f035dc0ecb964a3ca391ae1ca2b87cb0f6a7cec
Diffstat (limited to 'java/dex.go')
| -rw-r--r-- | java/dex.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/dex.go b/java/dex.go index ce0c18e6..625fb83c 100644 --- a/java/dex.go +++ b/java/dex.go @@ -157,6 +157,8 @@ func (j *Module) r8Flags(ctx android.ModuleContext, flags javaBuilderFlags) (r8F if !Bool(opt.Obfuscate) { r8Flags = append(r8Flags, "-dontobfuscate") } + // TODO(ccross): if this is an instrumentation test of an obfuscated app, use the + // dictionary of the app and move the app from libraryjars to injars. return r8Flags, r8Deps } @@ -171,8 +173,6 @@ func (j *Module) compileDex(ctx android.ModuleContext, flags javaBuilderFlags, outDir := android.PathForModuleOut(ctx, "dex") if useR8 { - // TODO(ccross): if this is an instrumentation test of an obfuscated app, use the - // dictionary of the app and move the app from libraryjars to injars. proguardDictionary := android.PathForModuleOut(ctx, "proguard_dictionary") j.proguardDictionary = proguardDictionary r8Flags, r8Deps := j.r8Flags(ctx, flags) |