Do not unwrap typedefs on lookups

TypeDefs were replaced with actual types in lookups, so package
containing typedef could be not included.

This change keeps typedef declarations and imports package with
typedef declaration.

Bug: 65266511

Test: mma
Test: manual check that include became correct
Test: /hardware/interfaces output is unchanged, however
  CL changes the behavior

Change-Id: Iee78228c9acfa4dbd16c3ca4ec0d9568a927d0f6

1 files changed, 14 insertions, 1 deletions

diff --git a/Reference.h b/Reference.h
index 13f209a..a016ef6 100644
--- a/Reference.h
+++ b/Reference.h
@@ -51,12 +51,25 @@ struct Reference {
     T* operator->() { return get(); }
     const T* operator->() const { return get(); }
 
+    /* Returns referenced object.
+       If a type is referenced, all typedefs are unwraped. */
     T* get() {
         CHECK(mResolved != nullptr);
-        return mResolved;
+        return mResolved->resolve();
     }
     const T* get() const {
         CHECK(mResolved != nullptr);
+        return mResolved->resolve();
+    }
+
+    /* Returns exact referenced object.
+       If a type is referenced, typedefs are not unwraped. */
+    T* shallowGet() {
+        CHECK(mResolved != nullptr);
+        return mResolved;
+    }
+    const T* shallowGet() const {
+        CHECK(mResolved != nullptr);
         return mResolved;
     }