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

Merge "Allow overriding the compile SDK" into pi-dev

Browse Source 
am: fd5166ddac

Change-Id: I53d265b82f4a0e9b86b1324900e133911a355104
This commit is contained in:
Todd Kennedy
2018-04-23 20:23:12 -07:00
committed by android-build-merger
parent fbed7ebade fd5166ddac
commit e31a442140
1 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
tools/aapt2/cmd/Link.cpp
View File

@@ -798,35 +798,39 @@ class LinkCommand {
return;
}
xml::Attribute* attr = manifest_xml->root->FindAttribute(xml::kSchemaAndroid, "versionCode");
if (attr != nullptr) {
Maybe<std::string>& compile_sdk_version = options_.manifest_fixer_options.compile_sdk_version;
if (BinaryPrimitive* prim = ValueCast<BinaryPrimitive>(attr->compiled_value.get())) {
switch (prim->value.dataType) {
case Res_value::TYPE_INT_DEC:
compile_sdk_version = StringPrintf("%" PRId32, static_cast<int32_t>(prim->value.data));
break;
case Res_value::TYPE_INT_HEX:
compile_sdk_version = StringPrintf("%" PRIx32, prim->value.data);
break;
default:
break;
if (!options_.manifest_fixer_options.compile_sdk_version) {
xml::Attribute* attr = manifest_xml->root->FindAttribute(xml::kSchemaAndroid, "versionCode");
if (attr != nullptr) {
Maybe<std::string>& compile_sdk_version = options_.manifest_fixer_options.compile_sdk_version;
if (BinaryPrimitive* prim = ValueCast<BinaryPrimitive>(attr->compiled_value.get())) {
switch (prim->value.dataType) {
case Res_value::TYPE_INT_DEC:
compile_sdk_version = StringPrintf("%" PRId32, static_cast<int32_t>(prim->value.data));
break;
case Res_value::TYPE_INT_HEX:
compile_sdk_version = StringPrintf("%" PRIx32, prim->value.data);
break;
default:
break;
}
} else if (String* str = ValueCast<String>(attr->compiled_value.get())) {
compile_sdk_version = *str->value;
} else {
compile_sdk_version = attr->value;
}
} else if (String* str = ValueCast<String>(attr->compiled_value.get())) {
compile_sdk_version = *str->value;
} else {
compile_sdk_version = attr->value;
}
}
attr = manifest_xml->root->FindAttribute(xml::kSchemaAndroid, "versionName");
if (attr != nullptr) {
Maybe<std::string>& compile_sdk_version_codename =
options_.manifest_fixer_options.compile_sdk_version_codename;
if (String* str = ValueCast<String>(attr->compiled_value.get())) {
compile_sdk_version_codename = *str->value;
} else {
compile_sdk_version_codename = attr->value;
if (!options_.manifest_fixer_options.compile_sdk_version_codename) {
xml::Attribute* attr = manifest_xml->root->FindAttribute(xml::kSchemaAndroid, "versionName");
if (attr != nullptr) {
Maybe<std::string>& compile_sdk_version_codename =
options_.manifest_fixer_options.compile_sdk_version_codename;
if (String* str = ValueCast<String>(attr->compiled_value.get())) {
compile_sdk_version_codename = *str->value;
} else {
compile_sdk_version_codename = attr->value;
}
}
}
}
@@ -2102,6 +2106,13 @@ int Link(const std::vector<StringPiece>& args, IDiagnostics* diagnostics) {
.OptionalFlag("--version-name",
"Version name to inject into the AndroidManifest.xml if none is present.",
&options.manifest_fixer_options.version_name_default)
.OptionalFlag("--compile-sdk-version-code",
"Version code (integer) to inject into the AndroidManifest.xml if none is\n"
"present.",
&options.manifest_fixer_options.compile_sdk_version)
.OptionalFlag("--compile-sdk-version-name",
"Version name to inject into the AndroidManifest.xml if none is present.",
&options.manifest_fixer_options.compile_sdk_version_codename)
.OptionalSwitch("--shared-lib", "Generates a shared Android runtime library.",
&shared_lib)
.OptionalSwitch("--static-lib", "Generate a static Android library.", &static_lib)