Merge "aapt2: Fix issue with Manifest duplicate handling"

  Result result = Result::kAdded;

  auto iter = indexed_members_.find(member->GetName());

  if (iter != indexed_members_.end()) {

    // Overwrite the entry.

    ordered_members_[iter->second].reset();

    // Overwrite the entry. Be careful, as the key in indexed_members_ is actually memory owned

    // by the value at ordered_members_[index]. Since overwriting a value for a key doesn't replace

    // the key (the initial key inserted into the unordered_map is kept), we must erase and then

    // insert a new key, whose memory is being kept around. We do all this to avoid using more

    // memory for each key.

    size_t index = iter->second;

    // Erase the key + value from the map.

    indexed_members_.erase(iter);

    // Now clear the memory that was backing the key (now erased).

    ordered_members_[index].reset();

    result = Result::kOverridden;

  }

  std::unique_ptr<xml::XmlResource> manifest = test::BuildXmlDom(R"(

      <manifest xmlns:android="http://schemas.android.com/apk/res/android">

        <permission android:name="android.permission.ACCESS_INTERNET" />

        <permission android:name="com.android.aapt.test.ACCESS_INTERNET" />

        <permission android:name="com.android.sample.ACCESS_INTERNET" />

        <permission android:name="com.android.permission.UNRELATED_PERMISSION" />

        <permission android:name="com.android.aapt.test.ACCESS_INTERNET" /> -->

      </manifest>)");

  std::string actual;

  ASSERT_TRUE(GetManifestClassText(context.get(), manifest.get(), &actual));

  EXPECT_THAT(actual, HasSubstr("ACCESS_INTERNET=\"com.android.aapt.test.ACCESS_INTERNET\";"));

  EXPECT_THAT(actual, Not(HasSubstr("ACCESS_INTERNET=\"android.permission.ACCESS_INTERNET\";")));

  EXPECT_THAT(actual, Not(HasSubstr("ACCESS_INTERNET=\"com.android.sample.ACCESS_INTERNET\";")));

}

static ::testing::AssertionResult GetManifestClassText(IAaptContext* context, xml::XmlResource* res,