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

Commit d476e290 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AAPT: treat "-I" with lower precedence than main APK for dumping." into oc-mr1-dev

parents 81831f89 94251fac

tools/aapt/Command.cpp

+6 −5
Original line number Diff line number Diff line
@@ -757,12 +757,8 @@ int doDump(Bundle* bundle) 


    AssetManager assets;

    int32_t assetsCookie;

    if (!assets.addAssetPath(String8(filename), &assetsCookie)) {

        fprintf(stderr, "ERROR: dump failed because assets could not be loaded\n");

        return 1;

    }



    // Now add any dependencies passed in.

    // 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)) {
@@ -771,6 +767,11 @@ int doDump(Bundle* bundle) 
      }

    }



    if (!assets.addAssetPath(String8(filename), &assetsCookie)) {

        fprintf(stderr, "ERROR: dump failed because assets could not be loaded\n");

        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