diff options
author | Yohann Roussel <yroussel@google.com> | 2015-04-08 18:25:39 +0200 |
---|---|---|
committer | Benoit Lamarche <benoitlamarche@google.com> | 2015-04-08 18:45:21 +0200 |
commit | ab2d180e44435ca418accc8fbc2ad1441e6b23ad (patch) | |
tree | 5e9e4c3101c598cc53a6c4ea01d0277894f08c22 /jack | |
parent | 50ab98605f6839940a495cb58a08b9f1588309a3 (diff) | |
download | toolchain_jack-ab2d180e44435ca418accc8fbc2ad1441e6b23ad.tar.gz toolchain_jack-ab2d180e44435ca418accc8fbc2ad1441e6b23ad.tar.bz2 toolchain_jack-ab2d180e44435ca418accc8fbc2ad1441e6b23ad.zip |
PackageCodec expects java source name
Not binary names.
Bug: 20118240
Change-Id: Iadfbd2d137e8c004abab45ccad4bd195f16aa0b7
Diffstat (limited to 'jack')
-rw-r--r-- | jack/src/com/android/jack/shrob/obfuscation/Renamer.java | 5 | ||||
-rw-r--r-- | jack/src/com/android/jack/shrob/proguard/GrammarActions.java | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/jack/src/com/android/jack/shrob/obfuscation/Renamer.java b/jack/src/com/android/jack/shrob/obfuscation/Renamer.java index 8f5e282f..5c96123a 100644 --- a/jack/src/com/android/jack/shrob/obfuscation/Renamer.java +++ b/jack/src/com/android/jack/shrob/obfuscation/Renamer.java @@ -33,6 +33,7 @@ import com.android.jack.shrob.obfuscation.nameprovider.NameProvider; import com.android.jack.shrob.proguard.GrammarActions; import com.android.jack.transformations.request.ChangeEnclosingPackage; import com.android.jack.transformations.request.TransformationRequest; +import com.android.jack.util.NamingTools; import com.android.jack.util.PackageCodec; import com.android.sched.item.Description; import com.android.sched.marker.MarkerManager; @@ -251,7 +252,7 @@ public class Renamer implements RunnableSchedulable<JSession> { @Nonnull private final String packageNameForRenamedClasses = - ThreadConfig.get(PACKAGE_FOR_RENAMED_CLASSES); + NamingTools.getBinaryName(ThreadConfig.get(PACKAGE_FOR_RENAMED_CLASSES)); @Nonnull private final JPackage packageForRenamedClasses @@ -290,7 +291,7 @@ public class Renamer implements RunnableSchedulable<JSession> { @Nonnull private final String packageNameForRenamedPackages = - ThreadConfig.get(PACKAGE_FOR_RENAMED_PACKAGES); + NamingTools.getBinaryName(ThreadConfig.get(PACKAGE_FOR_RENAMED_PACKAGES)); @Nonnull private final JPackage packageForRenamedPackages diff --git a/jack/src/com/android/jack/shrob/proguard/GrammarActions.java b/jack/src/com/android/jack/shrob/proguard/GrammarActions.java index 1777f0ea..6dac907f 100644 --- a/jack/src/com/android/jack/shrob/proguard/GrammarActions.java +++ b/jack/src/com/android/jack/shrob/proguard/GrammarActions.java @@ -484,8 +484,6 @@ public class GrammarActions { // TODO(delphinemartin): error when newPackage contains '*' or '?' if (newPackage == null) { newPackage = ""; - } else { - newPackage = NamingTools.getBinaryName(newPackage); } flags.setPackageForRenamedClasses(newPackage); flags.addKeepPackageNames(name(newPackage), false); @@ -496,8 +494,6 @@ public class GrammarActions { // TODO(delphinemartin): error when newPackage contains '*' or '?' if (newPackage == null) { newPackage = ""; - } else { - newPackage = NamingTools.getBinaryName(newPackage); } flags.setPackageForFlatHierarchy(newPackage); flags.addKeepPackageNames(name(newPackage), false); |