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

Commit d1ac6e1f authored by Donald Chai's avatar Donald Chai
Browse files

AAPT: treat "-I" with lower precedence than main APK for dumping. 

This is the desired behavior if resource IDs may overlap, and also happens to
improve the behavior of:

  aapt dump -I base.apk badging feature.apk

when both APKs use the same package name with different package IDs
(base=0x7F, feature=0x80).  Previously, the final call to
DynamicRefTable::addMapping was for base.apk, and all references to 0x80 were
rewritten in DynamicRefTable::lookupResourceId to 0x7F.  After this
change resources defined in both APKs are resolved correctly.

Note that this is a bit of kludge, and APKs should use different names
to avoid conflating the package IDs.

Fixes: 67070085
Bug: 64058531
Test: manual with sample in b/67070085#comment2
Change-Id: I285adb6f44a297440b08fc7a1f9ad73c700eb9bc
parent 96a30ab8

tools/aapt/Command.cpp

+6 −5
Original line number Diff line number Diff line
@@ -739,12 +739,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)) {
@@ -753,6 +749,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