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

Commit 33644ff3 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "AAPT: Allow including dependencies in dump command" into oc-dev

parents c3b938ca 57fe4838
Loading
Loading
Loading
Loading
+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