Permalink
Browse files

return from functions early that modify apk for compat purposes

Conflicts:
	tools/aapt/ResourceTable.cpp
  • Loading branch information...
iBotPeaches committed Oct 6, 2015
1 parent 179a6bd commit 5cded8132294c860a374409b7e0c94167ab91e06
Showing with 5 additions and 1 deletion.
  1. +1 −0 tools/aapt/AaptConfig.cpp
  2. +4 −1 tools/aapt/ResourceTable.cpp
@@ -244,6 +244,7 @@ bool parseCommaSeparatedList(const String8& str, std::set<ConfigDescription>* ou
}
void applyVersionForCompatibility(ConfigDescription* config) {
+ return;
if (config == NULL) {
return;
}
@@ -4544,6 +4544,8 @@ bool ResourceTable::shouldGenerateVersionedResource(
* attribute will be respected.
*/
status_t ResourceTable::modifyForCompat(const Bundle* bundle) {
+ return NO_ERROR;
+
const int minSdk = getMinSdkVersion(bundle);
if (minSdk >= SDK_LOLLIPOP_MR1) {
// Lollipop MR1 and up handles public attributes differently, no
@@ -4678,9 +4680,10 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle,
const String16& resourceName,
const sp<AaptFile>& target,
const sp<XMLNode>& root) {
+ return NO_ERROR;
+
const String16 vector16("vector");
const String16 animatedVector16("animated-vector");
-
const int minSdk = getMinSdkVersion(bundle);
if (minSdk >= SDK_LOLLIPOP_MR1) {
// Lollipop MR1 and up handles public attributes differently, no

0 comments on commit 5cded81

Please sign in to comment.