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

Commit dca6b774 authored by Chris Craik's avatar Chris Craik Committed by android-build-merger
Browse files

Merge "Support profileable application action" into qt-dev 

am: 7cefe09e

Change-Id: I1f1be83cae4a22a343e546c448be852732721450
parents 8b25efda 7cefe09e

tools/aapt2/link/ManifestFixer.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -367,6 +367,7 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor, 




  application_action["uses-library"].Action(RequiredNameIsNotEmpty);

  application_action["uses-library"].Action(RequiredNameIsNotEmpty);

  application_action["library"].Action(RequiredNameIsNotEmpty);

  application_action["library"].Action(RequiredNameIsNotEmpty);

  application_action["profileable"];





  xml::XmlNodeAction& static_library_action = application_action["static-library"];

  xml::XmlNodeAction& static_library_action = application_action["static-library"];

  static_library_action.Action(RequiredNameIsJavaPackage);

  static_library_action.Action(RequiredNameIsJavaPackage);

tools/aapt2/link/ManifestFixer_test.cpp

+18 −0
Original line number Original line Diff line number Diff line
@@ -671,6 +671,24 @@ TEST_F(ManifestFixerTest, ApplicationInjectDebuggable) { 
      {}, "application", xml::kSchemaAndroid, "debuggable", "true"), NotNull());

      {}, "application", xml::kSchemaAndroid, "debuggable", "true"), NotNull());

}

}





TEST_F(ManifestFixerTest, ApplicationProfileable) {

  std::string shell = R"(

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

          package="android">

        <application>

          <profileable android:shell="true"/>

        </application>

      </manifest>)";

  EXPECT_THAT(Verify(shell), NotNull());

  std::string noshell = R"(

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

          package="android">

        <application>

          <profileable/>

        </application>

      </manifest>)";

  EXPECT_THAT(Verify(noshell), NotNull());

}





TEST_F(ManifestFixerTest, IgnoreNamespacedElements) {

TEST_F(ManifestFixerTest, IgnoreNamespacedElements) {

  std::string input = R"EOF(

  std::string input = R"EOF(