Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71a7b9ad authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "AAPT2: Insert <uses-sdk> element before <application>"

parents 12ffdd86 e343eb14

tools/aapt2/link/Link.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -1356,8 +1356,8 @@ class LinkCommand { 
    application_el->attributes.push_back(

    application_el->attributes.push_back(

        xml::Attribute{xml::kSchemaAndroid, "hasCode", "false"});

        xml::Attribute{xml::kSchemaAndroid, "hasCode", "false"});





    manifest_el->AddChild(std::move(application_el));

    manifest_el->AppendChild(std::move(application_el));

    namespace_android->AddChild(std::move(manifest_el));

    namespace_android->AppendChild(std::move(manifest_el));

    doc->root = std::move(namespace_android);

    doc->root = std::move(namespace_android);

    return doc;

    return doc;

  }

  }

tools/aapt2/link/ManifestFixer.cpp

+6 −3
Original line number Original line Diff line number Diff line
@@ -309,10 +309,12 @@ bool ManifestFixer::Consume(IAaptContext* context, xml::XmlResource* doc) { 
  if ((options_.min_sdk_version_default ||

  if ((options_.min_sdk_version_default ||

       options_.target_sdk_version_default) &&

       options_.target_sdk_version_default) &&

      root->FindChild({}, "uses-sdk") == nullptr) {

      root->FindChild({}, "uses-sdk") == nullptr) {

    // Auto insert a <uses-sdk> element.

    // Auto insert a <uses-sdk> element. This must be inserted before the

    // <application> tag. The device runtime PackageParser will make SDK version

    // decisions while parsing <application>.

    std::unique_ptr<xml::Element> uses_sdk = util::make_unique<xml::Element>();

    std::unique_ptr<xml::Element> uses_sdk = util::make_unique<xml::Element>();

    uses_sdk->name = "uses-sdk";

    uses_sdk->name = "uses-sdk";

    root->AddChild(std::move(uses_sdk));

    root->InsertChild(0, std::move(uses_sdk));

  }

  }





  xml::XmlActionExecutor executor;

  xml::XmlActionExecutor executor;
@@ -327,7 +329,8 @@ bool ManifestFixer::Consume(IAaptContext* context, xml::XmlResource* doc) { 




  if (options_.rename_manifest_package) {

  if (options_.rename_manifest_package) {

    // Rename manifest package outside of the XmlActionExecutor.

    // Rename manifest package outside of the XmlActionExecutor.

    // We need to extract the old package name and FullyQualify all class names.

    // We need to extract the old package name and FullyQualify all class

    // names.

    if (!RenameManifestPackage(options_.rename_manifest_package.value(),

    if (!RenameManifestPackage(options_.rename_manifest_package.value(),

                               root)) {

                               root)) {

      return false;

      return false;

tools/aapt2/link/ManifestFixer_test.cpp

+44 −0
Original line number Original line Diff line number Diff line
@@ -168,6 +168,50 @@ TEST_F(ManifestFixerTest, UseDefaultSdkVersionsIfNonePresent) { 
  EXPECT_EQ("22", attr->value);

  EXPECT_EQ("22", attr->value);

}

}





TEST_F(ManifestFixerTest, UsesSdkMustComeBeforeApplication) {

  ManifestFixerOptions options = {std::string("8"), std::string("22")};

  std::unique_ptr<xml::XmlResource> doc = VerifyWithOptions(R"EOF(

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

                    package="android">

            <application android:name=".MainApplication" />

          </manifest>)EOF",

                                                            options);

  ASSERT_NE(nullptr, doc);



  xml::Element* manifest_el = xml::FindRootElement(doc.get());

  ASSERT_NE(nullptr, manifest_el);

  ASSERT_EQ("manifest", manifest_el->name);



  xml::Element* application_el = manifest_el->FindChild("", "application");

  ASSERT_NE(nullptr, application_el);



  xml::Element* uses_sdk_el = manifest_el->FindChild("", "uses-sdk");

  ASSERT_NE(nullptr, uses_sdk_el);



  // Check that the uses_sdk_el comes before application_el in the children

  // vector.

  // Since there are no namespaces here, these children are direct descendants

  // of manifest.

  auto uses_sdk_iter =

      std::find_if(manifest_el->children.begin(), manifest_el->children.end(),

                   [&](const std::unique_ptr<xml::Node>& child) {

                     return child.get() == uses_sdk_el;

                   });



  auto application_iter =

      std::find_if(manifest_el->children.begin(), manifest_el->children.end(),

                   [&](const std::unique_ptr<xml::Node>& child) {

                     return child.get() == application_el;

                   });



  ASSERT_NE(manifest_el->children.end(), uses_sdk_iter);

  ASSERT_NE(manifest_el->children.end(), application_iter);



  // The distance should be positive, meaning uses_sdk_iter comes before

  // application_iter.

  EXPECT_GT(std::distance(uses_sdk_iter, application_iter), 0);

}



TEST_F(ManifestFixerTest, RenameManifestPackageAndFullyQualifyClasses) {

TEST_F(ManifestFixerTest, RenameManifestPackageAndFullyQualifyClasses) {

  ManifestFixerOptions options;

  ManifestFixerOptions options;

  options.rename_manifest_package = std::string("com.android");

  options.rename_manifest_package = std::string("com.android");

tools/aapt2/xml/XmlDom.cpp

+10 −5
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ static void AddToStack(Stack* stack, XML_Parser parser, 




  Node* this_node = node.get();

  Node* this_node = node.get();

  if (!stack->node_stack.empty()) {

  if (!stack->node_stack.empty()) {

    stack->node_stack.top()->AddChild(std::move(node));

    stack->node_stack.top()->AppendChild(std::move(node));

  } else {

  } else {

    stack->root = std::move(node);

    stack->root = std::move(node);

  }

  }
@@ -325,7 +325,7 @@ std::unique_ptr<XmlResource> Inflate(const void* data, size_t data_len, 
        root = std::move(new_node);

        root = std::move(new_node);

      } else {

      } else {

        CHECK(!node_stack.empty()) << "node stack should not be empty";

        CHECK(!node_stack.empty()) << "node stack should not be empty";

        node_stack.top()->AddChild(std::move(new_node));

        node_stack.top()->AppendChild(std::move(new_node));

      }

      }





      if (!NodeCast<Text>(this_node)) {

      if (!NodeCast<Text>(this_node)) {
@@ -346,7 +346,7 @@ std::unique_ptr<Node> Namespace::Clone() { 




  ns->children.reserve(children.size());

  ns->children.reserve(children.size());

  for (const std::unique_ptr<xml::Node>& child : children) {

  for (const std::unique_ptr<xml::Node>& child : children) {

    ns->AddChild(child->Clone());

    ns->AppendChild(child->Clone());

  }

  }

  return std::move(ns);

  return std::move(ns);

}

}
@@ -372,11 +372,16 @@ Element* FindRootElement(Node* node) { 
  return el;

  return el;

}

}





void Node::AddChild(std::unique_ptr<Node> child) {

void Node::AppendChild(std::unique_ptr<Node> child) {

  child->parent = this;

  child->parent = this;

  children.push_back(std::move(child));

  children.push_back(std::move(child));

}

}





void Node::InsertChild(size_t index, std::unique_ptr<Node> child) {

  child->parent = this;

  children.insert(children.begin() + index, std::move(child));

}



Attribute* Element::FindAttribute(const StringPiece& ns,

Attribute* Element::FindAttribute(const StringPiece& ns,

                                  const StringPiece& name) {

                                  const StringPiece& name) {

  for (auto& attr : attributes) {

  for (auto& attr : attributes) {
@@ -456,7 +461,7 @@ std::unique_ptr<Node> Element::Clone() { 




  el->children.reserve(children.size());

  el->children.reserve(children.size());

  for (const std::unique_ptr<xml::Node>& child : children) {

  for (const std::unique_ptr<xml::Node>& child : children) {

    el->AddChild(child->Clone());

    el->AppendChild(child->Clone());

  }

  }

  return std::move(el);

  return std::move(el);

}

}

tools/aapt2/xml/XmlDom.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,8 @@ class Node { 




  virtual ~Node() = default;

  virtual ~Node() = default;





  void AddChild(std::unique_ptr<Node> child);

  void AppendChild(std::unique_ptr<Node> child);

  void InsertChild(size_t index, std::unique_ptr<Node> child);

  virtual void Accept(RawVisitor* visitor) = 0;

  virtual void Accept(RawVisitor* visitor) = 0;

  virtual std::unique_ptr<Node> Clone() = 0;

  virtual std::unique_ptr<Node> Clone() = 0;

};

};