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

Merge "AAPT2: Insert platformBuild information" into pi-dev

Browse Source
This commit is contained in:
Ryan Mitchell
2018-05-11 15:18:56 +00:00
committed by Android (Google) Code Review
parent f36144f575 7cb82a86be
commit 91d2f87d0e
2 changed files with 69 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/aapt2/link/ManifestFixer.cpp
View File

@@ -275,6 +275,23 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor,
options_.version_code_default.value()});
}
}
if (el->FindAttribute("", "platformBuildVersionCode") == nullptr) {
auto versionCode = el->FindAttribute(xml::kSchemaAndroid, "versionCode");
if (versionCode != nullptr) {
el->attributes.push_back(xml::Attribute{"", "platformBuildVersionCode",
versionCode->value});
}
}
if (el->FindAttribute("", "platformBuildVersionName") == nullptr) {
auto versionName = el->FindAttribute(xml::kSchemaAndroid, "versionName");
if (versionName != nullptr) {
el->attributes.push_back(xml::Attribute{"", "platformBuildVersionName",
versionName->value});
}
}
return true;
});

52
tools/aapt2/link/ManifestFixer_test.cpp
View File

@@ -556,6 +556,58 @@ TEST_F(ManifestFixerTest, UnexpectedElementsInManifest) {
ASSERT_THAT(manifest, IsNull());
}
TEST_F(ManifestFixerTest, InsertPlatformBuildVersions) {
// Test for insertion when versionCode and versionName are included in the manifest
{
std::string input = R"(
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="android"
android:versionCode="27" android:versionName="O"/>)";
std::unique_ptr<xml::XmlResource> manifest = Verify(input);
ASSERT_THAT(manifest, NotNull());
xml::Attribute* attr = manifest->root->FindAttribute("", "platformBuildVersionCode");
ASSERT_THAT(attr, NotNull());
EXPECT_THAT(attr->value, StrEq("27"));
attr = manifest->root->FindAttribute("", "platformBuildVersionName");
ASSERT_THAT(attr, NotNull());
EXPECT_THAT(attr->value, StrEq("O"));
}
// Test for insertion when versionCode and versionName defaults are specified
{
std::string input = R"(
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="android"/>)";
ManifestFixerOptions options;
options.version_code_default = {"27"};
options.version_name_default = {"O"};
std::unique_ptr<xml::XmlResource> manifest = VerifyWithOptions(input, options);
ASSERT_THAT(manifest, NotNull());
xml::Attribute* attr = manifest->root->FindAttribute("", "platformBuildVersionCode");
ASSERT_THAT(attr, NotNull());
EXPECT_THAT(attr->value, StrEq("27"));
attr = manifest->root->FindAttribute("", "platformBuildVersionName");
ASSERT_THAT(attr, NotNull());
EXPECT_THAT(attr->value, StrEq("O"));
}
// Test that the platform build version attributes are not changed if they are currently present
{
std::string input = R"(
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="android"
android:versionCode="28" android:versionName="P"
platformBuildVersionCode="27" platformBuildVersionName="O"/>)";
std::unique_ptr<xml::XmlResource> manifest = Verify(input);
ASSERT_THAT(manifest, NotNull());
xml::Attribute* attr = manifest->root->FindAttribute("", "platformBuildVersionCode");
ASSERT_THAT(attr, NotNull());
EXPECT_THAT(attr->value, StrEq("27"));
attr = manifest->root->FindAttribute("", "platformBuildVersionName");
ASSERT_THAT(attr, NotNull());
EXPECT_THAT(attr->value, StrEq("O"));
}
}
TEST_F(ManifestFixerTest, UsesLibraryMustHaveNonEmptyName) {
std::string input = R"(