diff options
| author | mikaelpeltier <mikaelpeltier@google.com> | 2014-10-14 13:47:56 +0200 |
|---|---|---|
| committer | mikaelpeltier <mikaelpeltier@google.com> | 2014-10-15 15:36:09 +0200 |
| commit | 0bacdbb3a132123af75c2d68649bdde824977283 (patch) | |
| tree | b00e269c36cc83690c01d87ad68e072988a257f7 /jack/src/com/android/jack/jayce | |
| parent | a979eac7ce86b5eea1440ea892175c0321e1026c (diff) | |
| download | toolchain_jack-0bacdbb3a132123af75c2d68649bdde824977283.zip toolchain_jack-0bacdbb3a132123af75c2d68649bdde824977283.tar.gz toolchain_jack-0bacdbb3a132123af75c2d68649bdde824977283.tar.bz2 | |
Add InputLibraryLocation
Change-Id: Id4747e206396ede06814930158469e05d5e45f40
Diffstat (limited to 'jack/src/com/android/jack/jayce')
| -rw-r--r-- | jack/src/com/android/jack/jayce/JayceClassOrInterfaceLoader.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/jack/src/com/android/jack/jayce/JayceClassOrInterfaceLoader.java b/jack/src/com/android/jack/jayce/JayceClassOrInterfaceLoader.java index b492e11..8297450 100644 --- a/jack/src/com/android/jack/jayce/JayceClassOrInterfaceLoader.java +++ b/jack/src/com/android/jack/jayce/JayceClassOrInterfaceLoader.java @@ -26,6 +26,7 @@ import com.android.jack.ir.ast.JSession; import com.android.jack.library.HasInputLibrary; import com.android.jack.library.InputJackLibrary; import com.android.jack.library.InputLibrary; +import com.android.jack.library.TypeInInputLibraryLocation; import com.android.jack.load.AbtractClassOrInterfaceLoader; import com.android.jack.load.ClassOrInterfaceLoader; import com.android.jack.load.JackLoadingException; @@ -102,6 +103,9 @@ public class JayceClassOrInterfaceLoader extends AbtractClassOrInterfaceLoader i private final JPackage enclosingPackage; @Nonnull + private final Location location; + + @Nonnull final Tracer tracer = TracerFactory.getTracer(); JayceClassOrInterfaceLoader(@Nonnull InputJackLibrary jackLibrary, @@ -117,6 +121,8 @@ public class JayceClassOrInterfaceLoader extends AbtractClassOrInterfaceLoader i this.lookup = lookup; nnode = new SoftReference<DeclaredTypeNode>(null); this.defaultLoadLevel = defaultLoadLevel; + location = new TypeInInputLibraryLocation(inputJackLibrary.getLocation(), + Jack.getUserFriendlyFormatter().getName(enclosingPackage, simpleName)); } @Nonnull @@ -147,7 +153,7 @@ public class JayceClassOrInterfaceLoader extends AbtractClassOrInterfaceLoader i @Nonnull Location getLocation() { - return source.getLocation(); + return location; } @Nonnull |