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

Commit 5930c5ca authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

am da772234: Merge "AAPT: Ignore densities specified in -c flag" into...

am da772234: Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-dev automerge: 1e2e05bf
automerge: be6c1257

* commit 'be6c1257':
  AAPT: Ignore densities specified in -c flag
parents 8d7858f4 be6c1257
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -41,6 +41,13 @@ WeakResourceFilter::parse(const String8& str)
        // Ignore the version
        entry.second &= ~ResTable_config::CONFIG_VERSION;

        // Ignore any densities. Those are best handled in --preferred-density
        if ((entry.second & ResTable_config::CONFIG_DENSITY) != 0) {
            fprintf(stderr, "warning: ignoring flag -c %s. Use --preferred-density instead.\n", entry.first.toString().string());
            entry.first.density = 0;
            entry.second &= ~ResTable_config::CONFIG_DENSITY;
        }

        mConfigMask |= entry.second;
    }