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

Merge "Add instrumentation as a source tag for proguard keep options." into eclair

Browse Source
This commit is contained in:
Ying Wang
2010-01-19 11:55:12 -08:00
committed by Android (Google) Code Review
parent ccec75e7a8 46f4b9827e
commit b5fb50a133
1 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
tools/aapt/Resource.cpp
View File

@@ -1727,51 +1727,59 @@ writeProguardForAndroidManifest(ProguardKeepSet* keep, const sp<AaptAssets>& ass
depth++;
String8 tag(tree.getElementName(&len));
// printf("Depth %d tag %s\n", depth, tag.string());
bool keepTag = false;
if (depth == 1) {
if (tag != "manifest") {
fprintf(stderr, "ERROR: manifest does not start with <manifest> tag\n");
return -1;
}
pkg = getAttribute(tree, NULL, "package", NULL);
} else if (depth == 2 && tag == "application") {
inApplication = true;
} else if (depth == 2) {
if (tag == "application") {
inApplication = true;
keepTag = true;
} else if (tag == "instrumentation") {
keepTag = true;
}
}
if (inApplication) {
if (tag == "application" || tag == "activity" || tag == "service" || tag == "receiver"
|| tag == "provider") {
String8 name = getAttribute(tree, "http://schemas.android.com/apk/res/android",
"name", &error);
if (error != "") {
fprintf(stderr, "ERROR: %s\n", error.string());
return -1;
if (!keepTag && inApplication && depth == 3) {
if (tag == "activity" || tag == "service" || tag == "receiver" || tag == "provider") {
keepTag = true;
}
}
if (keepTag) {
String8 name = getAttribute(tree, "http://schemas.android.com/apk/res/android",
"name", &error);
if (error != "") {
fprintf(stderr, "ERROR: %s\n", error.string());
return -1;
}
if (name.length() > 0) {
// asdf --> package.asdf
// .asdf .a.b --> package.asdf package.a.b
// asdf.adsf --> asdf.asdf
String8 rule("-keep class ");
const char* p = name.string();
const char* q = strchr(p, '.');
if (p == q) {
rule += pkg;
rule += name;
} else if (q == NULL) {
rule += pkg;
rule += ".";
rule += name;
} else {
rule += name;
}
if (name.length() > 0) {
// asdf --> package.asdf
// .asdf .a.b --> package.asdf package.a.b
// asdf.adsf --> asdf.asdf
String8 rule("-keep class ");
const char* p = name.string();
const char* q = strchr(p, '.');
if (p == q) {
rule += pkg;
rule += name;
} else if (q == NULL) {
rule += pkg;
rule += ".";
rule += name;
} else {
rule += name;
}
String8 location = tag;
location += " ";
location += assFile->getSourceFile();
char lineno[20];
sprintf(lineno, ":%d", tree.getLineNumber());
location += lineno;
String8 location = tag;
location += " ";
location += assFile->getSourceFile();
char lineno[20];
sprintf(lineno, ":%d", tree.getLineNumber());
location += lineno;
keep->add(rule, location);
}
keep->add(rule, location);
}
}
}