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

Commit 57fe4838 authored by Adam Lesinski's avatar Adam Lesinski
Browse files

AAPT: Allow including dependencies in dump command 

Feature splits depend on their base. The dump badging command
does resource resolution, and needs to be able to find resources
located in the base APK of a feature split.

Bug: 38038608
Test: manual
Change-Id: I8c22f0083c46a853a3a56a4049715409ac2723fe
parent f93dc8b6

tools/aapt/Command.cpp

+9 −0
Original line number Diff line number Diff line
@@ -762,6 +762,15 @@ int doDump(Bundle* bundle) 
        return 1;

    }



    // Now add any dependencies passed in.

    for (size_t i = 0; i < bundle->getPackageIncludes().size(); i++) {

      const String8& assetPath = bundle->getPackageIncludes()[i];

      if (!assets.addAssetPath(assetPath, NULL)) {

        fprintf(stderr, "ERROR: included asset path %s could not be loaded\n", assetPath.string());

        return 1;

      }

    }



    // Make a dummy config for retrieving resources...  we need to supply

    // non-default values for some configs so that we can retrieve resources

    // in the app that don't have a default.  The most important of these is