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

Commit 4199528a authored by Ying Wang's avatar Ying Wang
Browse files

Only output proguard keep for nonempty attribute name in the AndroidManifest.xml. 

Before this change, aapt generates proguard keep flags like
"-keep class com.android.somepackage.", which proguard doesn't recognize.
parent ce63c639

tools/aapt/Resource.cpp

+25 −23
Original line number Diff line number Diff line
@@ -1745,6 +1745,7 @@ writeProguardForAndroidManifest(ProguardKeepSet* keep, const sp<AaptAssets>& ass 
                    fprintf(stderr, "ERROR: %s\n", error.string());

                    return -1;

                }

                if (name.length() > 0) {

                    // asdf     --> package.asdf

                    // .asdf  .a.b  --> package.asdf package.a.b

                    // asdf.adsf --> asdf.asdf
@@ -1773,6 +1774,7 @@ writeProguardForAndroidManifest(ProguardKeepSet* keep, const sp<AaptAssets>& ass 
                }

            }

        }

    }



    return NO_ERROR;

}