Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Re-enable -Wall and -Werror that were lost in a merge"

Browse Source
This commit is contained in:
Colin Cross
2015-04-09 00:49:55 +00:00
committed by Gerrit Code Review
parent e8a3c320e6 01f185633c
commit 1be312dfb0
4 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aapt/Android.mk
View File

@@ -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

1
tools/aapt/Images.cpp
View File

@@ -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;

1
tools/aapt/Resource.cpp
View File

@@ -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;

3
tools/aapt/ResourceTable.cpp
View File

@@ -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) {