commit 3578498643897401fc5b183b96e5e3c4e5ec1a37
author Jooyung Han <jooyung@google.com> Tue Jun 29 06:26:12 2021 +0900
committer Jooyung Han <jooyung@google.com> Tue Jun 29 02:08:14 2021 +0000
tree 0d76863b2e1008bbdc01d26ded1483b78a740478
parent 45aa1ef45d4314214c17e4dd9a1a951842719a55

Allow duplicate types from preprocessed

When compiling for SDK stub sources, we need to load documents which are
also a part of preprocessed framework.aidl, which results in inevitable
type duplication.

We allow duplicate types only if one of them is from preprocessed
document.

Bug: 192211616
Test: aidl_unittests
Change-Id: I21fc66d7305df824d2cc84308b84b9c9e9213d13

aidl_language.h

diff --git a/aidl_language.h b/aidl_language.h
index 4f19261..2dc1d91 100644
--- a/aidl_language.h
+++ b/aidl_language.h
@@ -123,6 +123,7 @@
 
 class AidlScope {
  public:
+  AidlScope(const AidlNode* self) : self_(self) {}
   virtual ~AidlScope() = default;
   virtual std::string ResolveName(const std::string& name) const = 0;
   void SetEnclosingScope(const AidlScope* enclosing) {
@@ -130,8 +131,10 @@
     enclosing_ = enclosing;
   }
   const AidlScope* GetEnclosingScope() const { return enclosing_; }
+  const AidlNode& GetNode() const { return *self_; }
 
  private:
+  const AidlNode* self_;
   const AidlScope* enclosing_ = nullptr;
 };
 
@@ -928,6 +931,7 @@
     if (package_.empty()) return std::vector<std::string>();
     return android::base::Split(package_, ".");
   }
+  const AidlDocument& GetDocument() const;
 
   virtual std::string GetPreprocessDeclarationName() const = 0;
 
@@ -1222,7 +1226,7 @@
  public:
   AidlDocument(const AidlLocation& location, const Comments& comments,
                std::vector<std::unique_ptr<AidlImport>> imports,
-               std::vector<std::unique_ptr<AidlDefinedType>> defined_types);
+               std::vector<std::unique_ptr<AidlDefinedType>> defined_types, bool is_preprocessed);
   ~AidlDocument() = default;
 
   // non-copyable, non-movable
@@ -1236,6 +1240,7 @@
   const std::vector<std::unique_ptr<AidlDefinedType>>& DefinedTypes() const {
     return defined_types_;
   }
+  bool IsPreprocessed() const { return is_preprocessed_; }
 
   void TraverseChildren(std::function<void(const AidlNode&)> traverse) const override {
     for (const auto& i : Imports()) {
@@ -1250,6 +1255,7 @@
  private:
   const std::vector<std::unique_ptr<AidlImport>> imports_;
   const std::vector<std::unique_ptr<AidlDefinedType>> defined_types_;
+  bool is_preprocessed_;
 };
 
 template <typename T>