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

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

Merge "Make sure Proguard keeps zygote preload class."

parents 340107f5 6c83e0c5

tools/aapt2/java/ProguardRules.cpp

+9 −0
Original line number Diff line number Diff line
@@ -281,6 +281,15 @@ class ManifestVisitor : public BaseVisitor { 
            AddClass(node->line_number, result.value(), "");

          }

        }



        attr = node->FindAttribute(xml::kSchemaAndroid, "zygotePreloadName");

        if (attr) {

          Maybe<std::string> result = util::GetFullyQualifiedClassName(package_, attr->value);

          if (result) {

            AddClass(node->line_number, result.value(), "");

          }

        }



        if (main_dex_only_) {

          xml::Attribute* default_process = node->FindAttribute(xml::kSchemaAndroid, "process");

          if (default_process) {

tools/aapt2/java/ProguardRules_test.cpp

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ TEST(ProguardRulesTest, ManifestRuleDefaultConstructorOnly) { 
            android:appComponentFactory="com.foo.BarAppComponentFactory"

            android:backupAgent="com.foo.BarBackupAgent"

            android:name="com.foo.BarApplication"

            android:zygotePreloadName="com.foo.BarZygotePreload"

            >

          <activity android:name="com.foo.BarActivity"/>

          <service android:name="com.foo.BarService"/>
@@ -63,6 +64,7 @@ TEST(ProguardRulesTest, ManifestRuleDefaultConstructorOnly) { 
  EXPECT_THAT(actual, HasSubstr("-keep class com.foo.BarReceiver { <init>(); }"));

  EXPECT_THAT(actual, HasSubstr("-keep class com.foo.BarProvider { <init>(); }"));

  EXPECT_THAT(actual, HasSubstr("-keep class com.foo.BarInstrumentation { <init>(); }"));

  EXPECT_THAT(actual, HasSubstr("-keep class com.foo.BarZygotePreload { <init>(); }"));



  actual = GetKeepSetString(set, /** minimal_rules */ true);

  EXPECT_THAT(actual, HasSubstr("-keep class com.foo.BarAppComponentFactory { <init>(); }"));
@@ -73,6 +75,7 @@ TEST(ProguardRulesTest, ManifestRuleDefaultConstructorOnly) { 
  EXPECT_THAT(actual, HasSubstr("-keep class com.foo.BarReceiver { <init>(); }"));

  EXPECT_THAT(actual, HasSubstr("-keep class com.foo.BarProvider { <init>(); }"));

  EXPECT_THAT(actual, HasSubstr("-keep class com.foo.BarInstrumentation { <init>(); }"));

  EXPECT_THAT(actual, HasSubstr("-keep class com.foo.BarZygotePreload { <init>(); }"));

}



TEST(ProguardRulesTest, FragmentNameRuleIsEmitted) {