Merge "Fix ApexCompressionTests" into main
diff --git a/apexd/Android.bp b/apexd/Android.bp
index 871b597..0494889 100644
--- a/apexd/Android.bp
+++ b/apexd/Android.bp
@@ -528,7 +528,7 @@
":com.android.apex.compressed.v1",
":com.android.apex.compressed.v1_different_digest",
":com.android.apex.compressed.v1_different_digest_original",
- ":com.android.apex.compressed.v1_original",
+ ":com.android.apex.compressed.v1{.apex}",
":com.android.apex.compressed.v2",
":com.android.apex.compressed.v2_original",
":gen_manifest_mismatch_compressed_apex_v2",
@@ -633,7 +633,7 @@
":com.android.apex.compressed.v1",
":com.android.apex.compressed.v1_different_digest",
":com.android.apex.compressed.v1_different_digest_original",
- ":com.android.apex.compressed.v1_original",
+ ":com.android.apex.compressed.v1{.apex}",
":com.android.apex.compressed.v2",
":com.android.apex.compressed.v2_original",
":gen_manifest_mismatch_compressed_apex_v2",
diff --git a/apexd/apex_file_repository_test.cpp b/apexd/apex_file_repository_test.cpp
index ff88720..0166f0d 100644
--- a/apexd/apex_file_repository_test.cpp
+++ b/apexd/apex_file_repository_test.cpp
@@ -368,7 +368,7 @@
ApexFileRepository instance(decompression_dir.path);
// Prepare decompressed apex
- std::string filename = "com.android.apex.compressed.v1_original.apex";
+ std::string filename = "com.android.apex.compressed.v1.apex";
fs::copy(GetTestFile(filename), decompression_dir.path);
auto decompressed_path =
StringPrintf("%s/%s", decompression_dir.path, filename.c_str());
@@ -396,7 +396,7 @@
PrepareCompressedApex("com.android.apex.compressed.v1.capex",
built_in_dir.path, decompression_dir.path);
// Add a data apex that has kDecompressedApexPackageSuffix
- fs::copy(GetTestFile("com.android.apex.compressed.v1_original.apex"),
+ fs::copy(GetTestFile("com.android.apex.compressed.v1.apex"),
StringPrintf("%s/com.android.apex.compressed@1%s", data_dir.path,
kDecompressedApexPackageSuffix));
diff --git a/apexd/apex_file_test.cpp b/apexd/apex_file_test.cpp
index 4a2ac79..4d8642c 100644
--- a/apexd/apex_file_test.cpp
+++ b/apexd/apex_file_test.cpp
@@ -278,7 +278,7 @@
TEST(ApexFileTest, DecompressFailForNormalApex) {
const std::string file_path =
- kTestDataDir + "com.android.apex.compressed.v1_original.apex";
+ kTestDataDir + "com.android.apex.compressed.v1.apex";
Result<ApexFile> apex_file = ApexFile::Open(file_path);
ASSERT_RESULT_OK(apex_file);
@@ -344,7 +344,7 @@
auto capex = ApexFile::Open(capex_path);
ASSERT_TRUE(capex.ok());
const std::string decompressed_apex_path =
- kTestDataDir + "com.android.apex.compressed.v1_original.apex";
+ kTestDataDir + "com.android.apex.compressed.v1.apex";
auto decompressed_apex = ApexFile::Open(decompressed_apex_path);
ASSERT_TRUE(decompressed_apex.ok());
// Validate root digest
diff --git a/apexd/apexd_test.cpp b/apexd/apexd_test.cpp
index fb38855..d620172 100644
--- a/apexd/apexd_test.cpp
+++ b/apexd/apexd_test.cpp
@@ -441,8 +441,8 @@
TEST_F(ApexdUnitTest, ValidateDecompressedApex) {
auto capex = ApexFile::Open(
AddPreInstalledApex("com.android.apex.compressed.v1.capex"));
- auto decompressed_v1 = ApexFile::Open(
- AddDataApex("com.android.apex.compressed.v1_original.apex"));
+ auto decompressed_v1 =
+ ApexFile::Open(AddDataApex("com.android.apex.compressed.v1.apex"));
auto result =
ValidateDecompressedApex(std::cref(*capex), std::cref(*decompressed_v1));
@@ -556,8 +556,7 @@
auto ota_apex_path =
StringPrintf("%s/com.android.apex.compressed@1%s",
GetDecompressionDir().c_str(), kOtaApexPackageSuffix);
- fs::copy(GetTestFile("com.android.apex.compressed.v1_original.apex"),
- ota_apex_path);
+ fs::copy(GetTestFile("com.android.apex.compressed.v1.apex"), ota_apex_path);
return_value =
ProcessCompressedApex(compressed_apex_list, /* is_ota_chroot= */ false);
ASSERT_EQ(return_value.size(), 1u);
@@ -765,8 +764,7 @@
"%s/ota_apex%s", GetDecompressionDir().c_str(), kOtaApexPackageSuffix);
auto create_ota_apex = [&]() {
// Create an ota_apex first
- fs::copy(GetTestFile("com.android.apex.compressed.v1_original.apex"),
- ota_apex_path);
+ fs::copy(GetTestFile("com.android.apex.compressed.v1.apex"), ota_apex_path);
ASSERT_THAT(PathExists(ota_apex_path), HasValue(true));
};
create_ota_apex();
@@ -1891,7 +1889,7 @@
auto decompressed_apex = StringPrintf("%s/com.android.apex.compressed@1%s",
GetDecompressionDir().c_str(),
kDecompressedApexPackageSuffix);
- fs::copy(GetTestFile("com.android.apex.compressed.v1_original.apex"),
+ fs::copy(GetTestFile("com.android.apex.compressed.v1.apex"),
decompressed_apex);
// Add a decompressed apex that will be mounted, so should be not be removed
auto active_decompressed_apex = StringPrintf(
@@ -2702,7 +2700,7 @@
previous_built_in_dir.path);
// Place a uncompressed version apex in current built_in_dir
std::string apex_path =
- AddPreInstalledApex("com.android.apex.compressed.v1_original.apex");
+ AddPreInstalledApex("com.android.apex.compressed.v1.apex");
ASSERT_EQ(OnOtaChrootBootstrap(/*also_include_staged_apexes=*/false), 0);
@@ -2823,7 +2821,7 @@
// Test when we update CAPEX and there is a lower version present in data
TEST_F(ApexdMountTest, OnOtaChrootBootstrapDataLowerThanCapex) {
auto apex_path = AddPreInstalledApex("com.android.apex.compressed.v2.capex");
- AddDataApex("com.android.apex.compressed.v1_original.apex");
+ AddDataApex("com.android.apex.compressed.v1.apex");
ASSERT_EQ(OnOtaChrootBootstrap(/*also_include_staged_apexes=*/false), 0);
@@ -2868,8 +2866,7 @@
TEST_F(ApexdMountTest, OnOtaChrootBootstrapDataSameAsCapex) {
auto system_apex_path =
PrepareCompressedApex("com.android.apex.compressed.v1.capex");
- auto data_apex_path =
- AddDataApex("com.android.apex.compressed.v1_original.apex");
+ auto data_apex_path = AddDataApex("com.android.apex.compressed.v1.apex");
ASSERT_EQ(OnOtaChrootBootstrap(/*also_include_staged_apexes=*/false), 0);
@@ -3478,8 +3475,7 @@
InitializeVold(&checkpoint_interface);
AddPreInstalledApex("com.android.apex.compressed.v1.capex");
- std::string apex_path_2 =
- AddDataApex("com.android.apex.compressed.v1_original.apex");
+ std::string apex_path_2 = AddDataApex("com.android.apex.compressed.v1.apex");
ASSERT_THAT(
ApexFileRepository::GetInstance().AddPreInstalledApex({GetBuiltInDir()}),
@@ -3514,7 +3510,7 @@
std::string apex_path_1 =
AddPreInstalledApex("com.android.apex.compressed.v2.capex");
- AddDataApex("com.android.apex.compressed.v1_original.apex");
+ AddDataApex("com.android.apex.compressed.v1.apex");
ASSERT_THAT(
ApexFileRepository::GetInstance().AddPreInstalledApex({GetBuiltInDir()}),
@@ -3669,8 +3665,7 @@
TemporaryDir previous_built_in_dir;
PrepareCompressedApex("com.android.apex.compressed.v1.capex",
previous_built_in_dir.path);
- auto apex_path =
- AddPreInstalledApex("com.android.apex.compressed.v1_original.apex");
+ auto apex_path = AddPreInstalledApex("com.android.apex.compressed.v1.apex");
ASSERT_THAT(
ApexFileRepository::GetInstance().AddPreInstalledApex({GetBuiltInDir()}),
@@ -3708,10 +3703,9 @@
auto decompressed_apex_in_active_dir =
StringPrintf("%s/com.android.apex.compressed@1%s", GetDataDir().c_str(),
kDecompressedApexPackageSuffix);
- fs::copy(GetTestFile("com.android.apex.compressed.v1_original.apex"),
+ fs::copy(GetTestFile("com.android.apex.compressed.v1.apex"),
decompressed_apex_in_active_dir);
- auto apex_path =
- AddPreInstalledApex("com.android.apex.compressed.v1_original.apex");
+ auto apex_path = AddPreInstalledApex("com.android.apex.compressed.v1.apex");
ASSERT_THAT(
ApexFileRepository::GetInstance().AddPreInstalledApex({GetBuiltInDir()}),
@@ -4515,7 +4509,7 @@
SetBlockApexEnabled(true);
auto path1 = AddPreInstalledApex("com.android.apex.compressed.v1.capex");
- auto path2 = AddBlockApex("com.android.apex.compressed.v1_original.apex");
+ auto path2 = AddBlockApex("com.android.apex.compressed.v1.apex");
auto& instance = ApexFileRepository::GetInstance();
@@ -4571,7 +4565,7 @@
auto apex_session = CreateStagedSession("apex.apexd_test.apex", 123);
ASSERT_RESULT_OK(apex_session);
- CreateStagedSession("com.android.apex.compressed.v1_original.apex", 123);
+ CreateStagedSession("com.android.apex.compressed.v1.apex", 123);
apex_session->UpdateStateAndCommit(SessionState::STAGED);
OnStart();
@@ -4953,7 +4947,7 @@
AddPreInstalledApex("apex.apexd_test_different_app.apex");
std::string apex_path_3 = AddDataApex("apex.apexd_test_v2.apex");
std::string apex_path_4 =
- AddDecompressedApex("com.android.apex.compressed.v1_original.apex");
+ AddDecompressedApex("com.android.apex.compressed.v1.apex");
ASSERT_THAT(
ApexFileRepository::GetInstance().AddPreInstalledApex({GetBuiltInDir()}),
diff --git a/apexd/apexd_testdata/Android.bp b/apexd/apexd_testdata/Android.bp
index 4fec589..ea38250 100644
--- a/apexd/apexd_testdata/Android.bp
+++ b/apexd/apexd_testdata/Android.bp
@@ -183,17 +183,6 @@
}
apex {
- name: "com.android.apex.compressed.v1_original",
- manifest: "manifest_compressed.json",
- file_contexts: ":apex.test-file_contexts",
- prebuilts: ["sample_prebuilt_file"],
- key: "com.android.apex.compressed.key",
- installable: false,
- compressible: false,
- updatable: false,
-}
-
-apex {
name: "com.android.apex.compressed.v1_different_digest_original",
manifest: "manifest_compressed.json",
file_contexts: ":apex.test-file_contexts",
diff --git a/tests/Android.bp b/tests/Android.bp
index 46d4655..932a8bd 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -282,7 +282,7 @@
test_suites: ["general-tests"],
data: [
":com.android.apex.compressed.v1",
- ":com.android.apex.compressed.v1_original",
+ ":com.android.apex.compressed.v1{.apex}",
":com.android.apex.compressed.v1_different_digest",
":com.android.apex.compressed.v2",
":gen_manifest_mismatch_compressed_apex_v2",
@@ -302,7 +302,7 @@
],
test_suites: ["general-tests"],
java_resources: [
- ":com.android.apex.compressed.v1_original",
+ ":com.android.apex.compressed.v1{.apex}",
":com.android.apex.compressed.v2_original",
],
}
diff --git a/tests/app/src/com/android/tests/apex/app/ApexCompressionTests.java b/tests/app/src/com/android/tests/apex/app/ApexCompressionTests.java
index bd08299..5aab0dc 100644
--- a/tests/app/src/com/android/tests/apex/app/ApexCompressionTests.java
+++ b/tests/app/src/com/android/tests/apex/app/ApexCompressionTests.java
@@ -45,7 +45,7 @@
private static final TestApp UNCOMPRESSED_APEX_V1 = new TestApp(
"TestAppUncompressedApexV1", COMPRESSED_APEX_PACKAGE_NAME, 2, /*isApex*/ true,
- "com.android.apex.compressed.v1_original.apex");
+ "com.android.apex.compressed.v1.apex");
private static final TestApp UNCOMPRESSED_APEX_V2 = new TestApp(
"TestAppUncompressedApexV2", COMPRESSED_APEX_PACKAGE_NAME, 2, /*isApex*/ true,
"com.android.apex.compressed.v2_original.apex");
diff --git a/tests/src/com/android/tests/apex/host/ApexCompressionTests.java b/tests/src/com/android/tests/apex/host/ApexCompressionTests.java
index e37bc0d..43b7fe4 100644
--- a/tests/src/com/android/tests/apex/host/ApexCompressionTests.java
+++ b/tests/src/com/android/tests/apex/host/ApexCompressionTests.java
@@ -52,7 +52,7 @@
public class ApexCompressionTests extends BaseHostJUnit4Test {
private static final String COMPRESSED_APEX_PACKAGE_NAME = "com.android.apex.compressed";
private static final String ORIGINAL_APEX_FILE_NAME =
- COMPRESSED_APEX_PACKAGE_NAME + ".v1_original.apex";
+ COMPRESSED_APEX_PACKAGE_NAME + ".v1.apex";
private static final String DECOMPRESSED_DIR_PATH = "/data/apex/decompressed/";
private static final String APEX_ACTIVE_DIR = "/data/apex/active/";
private static final String OTA_RESERVED_DIR = "/data/apex/ota_reserved/";
@@ -415,7 +415,7 @@
@LargeTest
public void testOrphanedDecompressedApexInActiveDirIsIgnored() throws Exception {
final File apex = mHostUtils.getTestFile(
- COMPRESSED_APEX_PACKAGE_NAME + ".v1_original.apex");
+ COMPRESSED_APEX_PACKAGE_NAME + ".v1.apex");
// Prepare an APEX in active directory with .decompressed.apex suffix.
// Place the same apex in system too. When booting, system APEX should
// be mounted while the decomrpessed APEX in active direcotyr should
