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

Commit a775593c authored by William Goh's avatar William Goh Committed by Gerrit Code Review
Browse files

Merge "Fix common typos" into main

parents 3ec1964c 72974076

tools/aapt/ApkBuilder.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public: 
    android::status_t createSplitForConfigs(const std::set<ConfigDescription>& configs);



    /**

     * Adds a file to be written to the final APK. It's name must not collide

     * Adds a file to be written to the final APK. Its name must not collide

     * with that of any files previously added. When a Split APK is being

     * generated, duplicates can exist as long as they are in different splits

     * (resources.arsc, AndroidManifest.xml).

tools/aapt/Main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ void usage(void) 
        "       be loaded alongside the base APK at runtime.\n"

        "   --feature-of\n"

        "       Builds a split APK that is a feature of the apk specified here. Resources\n"

        "       in the base APK can be referenced from the the feature APK.\n"

        "       in the base APK can be referenced from the feature APK.\n"

        "   --feature-after\n"

        "       An app can have multiple Feature Split APKs which must be totally ordered.\n"

        "       If --feature-of is specified, this flag specifies which Feature Split APK\n"