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

Commit 88fa96c7 authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am 106f83ee: am 4cead39a: am 1be312df: Merge "Re-enable -Wall and -Werror that... 

am 106f83ee: am 4cead39a: am 1be312df: Merge "Re-enable -Wall and -Werror that were lost in a merge"

* commit '106f83ee':
  Re-enable -Wall and -Werror that were lost in a merge
parents 792ae337 106f83ee

tools/aapt/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -67,7 +67,7 @@ aaptHostStaticLibs := \ 
    libziparchive-host

    libziparchive-host





aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER)\"

aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER)\"

aaptCFLAGS += -Wall -Werror

aaptCFlags += -Wall -Werror





ifeq ($(HOST_OS),linux)

ifeq ($(HOST_OS),linux)

    aaptHostLdLibs += -lrt -ldl -lpthread

    aaptHostLdLibs += -lrt -ldl -lpthread

tools/aapt/Images.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -412,7 +412,6 @@ static void find_max_opacity(png_byte** rows, 
                             int startX, int startY, int endX, int endY, int dX, int dY,

                             int startX, int startY, int endX, int endY, int dX, int dY,

                             int* out_inset)

                             int* out_inset)

{

{

    bool opaque_within_inset = true;

    uint8_t max_opacity = 0;

    uint8_t max_opacity = 0;

    int inset = 0;

    int inset = 0;

    *out_inset = 0;

    *out_inset = 0;

tools/aapt/Resource.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -3056,7 +3056,6 @@ writeProguardForLayouts(ProguardKeepSet* keep, const sp<AaptAssets>& assets) 
        const sp<AaptDir>& d = dirs.itemAt(k);

        const sp<AaptDir>& d = dirs.itemAt(k);

        const String8& dirName = d->getLeaf();

        const String8& dirName = d->getLeaf();

        Vector<String8> startTags;

        Vector<String8> startTags;

        const char* startTag = NULL;

        const KeyedVector<String8, Vector<NamespaceAttributePair> >* tagAttrPairs = NULL;

        const KeyedVector<String8, Vector<NamespaceAttributePair> >* tagAttrPairs = NULL;

        if ((dirName == String8("layout")) || (strncmp(dirName.string(), "layout-", 7) == 0)) {

        if ((dirName == String8("layout")) || (strncmp(dirName.string(), "layout-", 7) == 0)) {

            tagAttrPairs = &kLayoutTagAttrPairs;

            tagAttrPairs = &kLayoutTagAttrPairs;

tools/aapt/ResourceTable.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -3167,7 +3167,7 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>& 
                    if (!validResources[i]) {

                    if (!validResources[i]) {

                        sp<ConfigList> c = t->getOrderedConfigs().itemAt(i);

                        sp<ConfigList> c = t->getOrderedConfigs().itemAt(i);

                        if (c != NULL) {

                        if (c != NULL) {

                            fprintf(stderr, "%s: no entries written for %s/%s (0x%08x)\n", log_prefix,

                            fprintf(stderr, "%s: no entries written for %s/%s (0x%08zx)\n", log_prefix,

                                    String8(typeName).string(), String8(c->getName()).string(),

                                    String8(typeName).string(), String8(c->getName()).string(),

                                    Res_MAKEID(p->getAssignedId() - 1, ti, i));

                                    Res_MAKEID(p->getAssignedId() - 1, ti, i));

                        }

                        }
@@ -4526,7 +4526,6 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle) { 
                    const KeyedVector<String16, Item>& bag = e->getBag();

                    const KeyedVector<String16, Item>& bag = e->getBag();

                    const size_t bagCount = bag.size();

                    const size_t bagCount = bag.size();

                    for (size_t bi = 0; bi < bagCount; bi++) {

                    for (size_t bi = 0; bi < bagCount; bi++) {

                        const Item& item = bag.valueAt(bi);

                        const uint32_t attrId = getResId(bag.keyAt(bi), &attr16);

                        const uint32_t attrId = getResId(bag.keyAt(bi), &attr16);

                        const int sdkLevel = getPublicAttributeSdkLevel(attrId);

                        const int sdkLevel = getPublicAttributeSdkLevel(attrId);

                        if (sdkLevel > 1 && sdkLevel > config.sdkVersion && sdkLevel > minSdk) {

                        if (sdkLevel > 1 && sdkLevel > config.sdkVersion && sdkLevel > minSdk) {