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

Commit 23d8300a authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "AAPT2: Emit @keep for sub-process app classes"

parents a3a25729 22a931ea

tools/aapt2/java/ProguardRules.cpp

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ class ManifestVisitor : public BaseVisitor { 
              component_process ? component_process->value : default_process_;

          get_name = !process.empty() && process[0] != ':';

        }

      } else if (node->name == "instrumentation") {

      } else if (node->name == "instrumentation" || node->name == "process") {

        get_name = true;

      }

tools/aapt2/java/ProguardRules_test.cpp

+4 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ TEST(ProguardRulesTest, ManifestRuleDefaultConstructorOnly) { 
            android:name="com.foo.BarApplication"

            android:zygotePreloadName="com.foo.BarZygotePreload"

            >

          <processes>

            <process android:process=":sub" android:name="com.foo.BazApplication" />

          </processes>

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

          <service android:name="com.foo.BarService"/>

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

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

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

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

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

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

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