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

Commit fa1e9d7a authored by Adam Lesinski's avatar Adam Lesinski
Browse files

AAPT: Fix --feature-of to allow non-public symbol visibility 

Test: manual
Change-Id: Iada18b201c6463011002f96285a64c64565a6e1c
parent 9bbe7878

tools/aapt/ResourceTable.cpp

+4 −2
Original line number Diff line number Diff line
@@ -2204,8 +2204,10 @@ uint32_t ResourceTable::getResId(const String16& package, 
                           package.string(), package.size(),

                           &specFlags);

    if (rid != 0) {

        if (onlyPublic) {

            if ((specFlags & ResTable_typeSpec::SPEC_PUBLIC) == 0) {

        if (onlyPublic && (specFlags & ResTable_typeSpec::SPEC_PUBLIC) == 0) {

            // If this is a feature split and the resource has the same

            // package name as us, then everything is public.

            if (mPackageType != AppFeature || mAssetsPackage != package) {

                return 0;

            }

        }