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

Commit 6d62b033 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AAPT2: Allow <meta-data> in <manifest>"

parents 598e9a7f 5119e517

tools/aapt2/.clang-format

+1 −0
Original line number Diff line number Diff line 
BasedOnStyle: Google

ColumnLimit: 100

tools/aapt2/Main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ namespace aapt { 
static const char* sMajorVersion = "2";



// Update minor version whenever a feature or flag is added.

static const char* sMinorVersion = "3";

static const char* sMinorVersion = "4";



int PrintVersion() {

  std::cerr << "Android Asset Packaging Tool (aapt) " << sMajorVersion << "."

tools/aapt2/link/ManifestFixer.cpp

+2 −0
Original line number Diff line number Diff line
@@ -216,6 +216,8 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor, 


  manifest_action["supports-gl-texture"];



  manifest_action["meta-data"] = meta_data_action;



  // Application actions.

  xml::XmlNodeAction& application_action = manifest_action["application"];

  application_action.Action(OptionalNameIsJavaClassName);

tools/aapt2/link/ManifestFixer_test.cpp

+17 −0
Original line number Diff line number Diff line
@@ -87,6 +87,23 @@ TEST_F(ManifestFixerTest, EnsureManifestHasPackage) { 
  EXPECT_EQ(nullptr, Verify("<manifest package=\"@string/str\" />"));

}



TEST_F(ManifestFixerTest, AllowMetaData) {

    auto doc = Verify(R"EOF(

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

                  package="android">

          <meta-data />

          <application>

            <meta-data />

            <activity android:name=".Hi"><meta-data /></activity>

            <activity-alias android:name=".Ho"><meta-data /></activity-alias>

            <receiver android:name=".OffToWork"><meta-data /></receiver>

            <provider android:name=".We"><meta-data /></provider>

            <service android:name=".Go"><meta-data /></service>

          </application>

        </manifest>)EOF");

    ASSERT_NE(nullptr, doc);

}



TEST_F(ManifestFixerTest, UseDefaultSdkVersionsIfNonePresent) {

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

tools/aapt2/readme.md

+4 −0
Original line number Diff line number Diff line 
# Android Asset Packaging Tool 2.0 (AAPT2) release notes



## Version 2.4

### `aapt2 link ...`

- Supports `<meta-data>` tags in `<manifest>`.



## Version 2.3

### `aapt2`

- Support new `font` resource type.