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

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

Merge "AAPT2: Allow <layout> in <activity> tag in AndroidManifest.xml"

parents 6e450e1a 7a917a27

tools/aapt2/integration-tests/AppOne/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -19,4 +19,11 @@ 
    <uses-sdk android:minSdkVersion="21" />



    <uses-permission-sdk-23 android:name="android.permission.TEST" android:maxSdkVersion="22" />



    <application>

        <activity android:name=".MyActivity">

            <layout android:defaultHeight="500dp"

                android:defaultWidth="600dp" />

        </activity>

    </application>

</manifest>

tools/aapt2/link/ManifestFixer.cpp

+3 −0
Original line number Diff line number Diff line
@@ -326,7 +326,10 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor, 
  uses_static_library_action.Action(RequiredAndroidAttribute("certDigest"));



  application_action["meta-data"] = meta_data_action;



  application_action["activity"] = component_action;

  application_action["activity"]["layout"];



  application_action["activity-alias"] = component_action;

  application_action["service"] = component_action;

  application_action["receiver"] = component_action;