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

Commit ffebd7c2 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am b4f41119: am a1d08886: Merge "Only output proguard keep for nonempty... 

am b4f41119: am a1d08886: Merge "Only output proguard keep for nonempty attribute name in the AndroidManifest.xml." into eclair

Merge commit 'b4f41119'

* commit 'b4f41119':
  Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
parents 4a4b6e0d b4f41119

tools/aapt/Resource.cpp

+25 −23
Original line number Diff line number Diff line
@@ -1768,6 +1768,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
@@ -1796,6 +1797,7 @@ writeProguardForAndroidManifest(ProguardKeepSet* keep, const sp<AaptAssets>& ass 
                }

            }

        }

    }



    return NO_ERROR;

}