diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-10 16:33:02 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-10 16:33:02 +0000 |
| commit | f8bb29ede94c79bc3781a2994945af7dbd108506 (patch) | |
| tree | 6e5150cb75f0d8e780b4d09ec65dd484a47381eb | |
| parent | 812cb57e45500777fe74a3bfe2ece16fdafe00a0 (diff) | |
| parent | e816b8f9a9d69f3e97acdcbec8f76f8a30064f1c (diff) | |
| download | apex-f8bb29ede94c79bc3781a2994945af7dbd108506.tar.gz | |
Snap for 10103804 from e816b8f9a9d69f3e97acdcbec8f76f8a30064f1c to mainline-tzdata5-release
Change-Id: I8e6b8af81b4789985e5a57a76b23fce21b34f582
188 files changed, 838 insertions, 124 deletions
diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_not_pre_installed_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_not_pre_installed_apex.asciipb index b2035c8e..f9fa80e4 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_not_pre_installed_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_not_pre_installed_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim_not_pre_installed.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v1_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v1_apex.asciipb index e108ba39..36203be3 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v1_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v1_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v1.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_additional_file_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_additional_file_apex.asciipb index 9211e61f..ec6cdc91 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_additional_file_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_additional_file_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v2_additional_file.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_additional_folder_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_additional_folder_apex.asciipb index a5d08272..3cf3082a 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_additional_folder_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_additional_folder_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v2_additional_folder.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_apex.asciipb index 9f834b37..9be44012 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v2.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_apk_in_apex_sdk_target_p_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_apk_in_apex_sdk_target_p_apex.asciipb index d684672a..0062934d 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_apk_in_apex_sdk_target_p_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_apk_in_apex_sdk_target_p_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_apk_in_apex_upgrades_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_apk_in_apex_upgrades_apex.asciipb index 918ce0c6..3f86e266 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_apk_in_apex_upgrades_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_apk_in_apex_upgrades_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v2_apk_in_apex_upgrades.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_different_certificate_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_different_certificate_apex.asciipb index 275064d2..1c89cb52 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_different_certificate_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_different_certificate_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v2_different_certificate.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_different_package_name_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_different_package_name_apex.asciipb index 3b242190..c89a7e61 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_different_package_name_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_different_package_name_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v2_different_package_name.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_install_constraints_empty_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_install_constraints_empty_apex.asciipb new file mode 100644 index 00000000..204f942d --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_install_constraints_empty_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_arm64/com.android.apex.cts.shim.v2_install_constraints_empty.apex" + } + dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v2_install_constraints_empty.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_install_constraints_invalid_fingerprint_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_install_constraints_invalid_fingerprint_apex.asciipb new file mode 100644 index 00000000..8f8a195b --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_install_constraints_invalid_fingerprint_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_arm64/com.android.apex.cts.shim.v2_install_constraints_invalid_fingerprint.apex" + } + dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v2_install_constraints_invalid_fingerprint.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_install_constraints_no_value_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_install_constraints_no_value_apex.asciipb new file mode 100644 index 00000000..fad13a88 --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_install_constraints_no_value_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_arm64/com.android.apex.cts.shim.v2_install_constraints_no_value.apex" + } + dest_file: "shim/prebuilts//arm/com.android.apex.cts.shim.v2_install_constraints_no_value.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_no_hashtree_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_no_hashtree_apex.asciipb index 866da01e..7d048d14 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_no_hashtree_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_no_hashtree_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v2_no_hashtree.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_rebootless_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_rebootless_apex.asciipb index 2f99030b..82272825 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_rebootless_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_rebootless_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v2_rebootless.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_sdk_target_p_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_sdk_target_p_apex.asciipb index abaf998b..45bbe961 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_sdk_target_p_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_sdk_target_p_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v2_sdk_target_p.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_sign_payload_with_different_key_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_sign_payload_with_different_key_apex.asciipb index 5bf4e32f..5139ea36 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_sign_payload_with_different_key_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_sign_payload_with_different_key_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v2_sign_payload_with_different_key.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_apex.asciipb index ff3a2958..c13ec423 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v2_signed_bob.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_rot_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_rot_apex.asciipb index af3c9b31..6e8bf1f7 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_rot_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_rot_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v2_signed_bob_rot.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_rot_rollback_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_rot_rollback_apex.asciipb index 45e3352e..ddadcfa7 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_rot_rollback_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_signed_bob_rot_rollback_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_unsigned_apk_container_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_unsigned_apk_container_apex.asciipb index 580a5f8a..2aaafb28 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_unsigned_apk_container_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_unsigned_apk_container_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "6508977" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v2_unsigned_apk_container.apex" } @@ -8,5 +8,8 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "rvc-dev" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_unsigned_payload_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_unsigned_payload_apex.asciipb index 078ac5a9..c2331d1e 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_unsigned_payload_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_unsigned_payload_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v2_unsigned_payload.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_with_post_install_hook_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_with_post_install_hook_apex.asciipb index 0798f5f4..e6646625 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_with_post_install_hook_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_with_post_install_hook_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v2_with_post_install_hook.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_with_pre_install_hook_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_with_pre_install_hook_apex.asciipb index 44a33be0..c5de871d 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_with_pre_install_hook_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_with_pre_install_hook_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v2_with_pre_install_hook.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_without_apk_in_apex_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_without_apk_in_apex_apex.asciipb index 19099b5c..00faf8df 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_without_apk_in_apex_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_without_apk_in_apex_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v2_without_apk_in_apex.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_wrong_sha_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_wrong_sha_apex.asciipb index 6db59119..7ccb6ebc 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_wrong_sha_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v2_wrong_sha_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v2_wrong_sha.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_apex.asciipb index d0c5a408..8987b855 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v3.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_rebootless_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_rebootless_apex.asciipb index 179ba8d3..2a5cf6cf 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_rebootless_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_rebootless_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v3_rebootless.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_signed_bob_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_signed_bob_apex.asciipb index 15d980cc..ede6adb3 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_signed_bob_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_signed_bob_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v3_signed_bob.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_signed_bob_rot_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_signed_bob_rot_apex.asciipb index 01313db9..906dcece 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_signed_bob_rot_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__arm_com_android_apex_cts_shim_v3_signed_bob_rot_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_arm64/com.android.apex.cts.shim.v3_signed_bob_rot.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_not_pre_installed_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_not_pre_installed_apex.asciipb new file mode 100644 index 00000000..7aec0c4e --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_not_pre_installed_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim_not_pre_installed.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim_not_pre_installed.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v1_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v1_apex.asciipb new file mode 100644 index 00000000..c7c5d96f --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v1_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v1.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v1.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_additional_file_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_additional_file_apex.asciipb new file mode 100644 index 00000000..6da96c9e --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_additional_file_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_additional_file.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_additional_file.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_additional_folder_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_additional_folder_apex.asciipb new file mode 100644 index 00000000..402c1bf4 --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_additional_folder_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_additional_folder.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_additional_folder.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_apex.asciipb new file mode 100644 index 00000000..f0ee12d4 --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_apk_in_apex_sdk_target_p_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_apk_in_apex_sdk_target_p_apex.asciipb new file mode 100644 index 00000000..3379860d --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_apk_in_apex_sdk_target_p_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_apk_in_apex_upgrades_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_apk_in_apex_upgrades_apex.asciipb new file mode 100644 index 00000000..d6ee9025 --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_apk_in_apex_upgrades_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_apk_in_apex_upgrades.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_apk_in_apex_upgrades.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_different_certificate_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_different_certificate_apex.asciipb new file mode 100644 index 00000000..eb2a8f98 --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_different_certificate_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_different_certificate.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_different_certificate.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_different_package_name_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_different_package_name_apex.asciipb new file mode 100644 index 00000000..c61e71ad --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_different_package_name_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_different_package_name.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_different_package_name.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_install_constraints_empty_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_install_constraints_empty_apex.asciipb new file mode 100644 index 00000000..9716a421 --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_install_constraints_empty_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_install_constraints_empty.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_install_constraints_empty.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_install_constraints_invalid_fingerprint_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_install_constraints_invalid_fingerprint_apex.asciipb new file mode 100644 index 00000000..5301d7a0 --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_install_constraints_invalid_fingerprint_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_install_constraints_invalid_fingerprint.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_install_constraints_invalid_fingerprint.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_install_constraints_no_value_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_install_constraints_no_value_apex.asciipb new file mode 100644 index 00000000..febef875 --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_install_constraints_no_value_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_install_constraints_no_value.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_install_constraints_no_value.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_no_hashtree_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_no_hashtree_apex.asciipb new file mode 100644 index 00000000..1b332b9a --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_no_hashtree_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_no_hashtree.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_no_hashtree.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_rebootless_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_rebootless_apex.asciipb new file mode 100644 index 00000000..b420f8b3 --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_rebootless_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_rebootless.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_rebootless.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_sdk_target_p_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_sdk_target_p_apex.asciipb new file mode 100644 index 00000000..019749ef --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_sdk_target_p_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_sdk_target_p.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_sdk_target_p.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_sign_payload_with_different_key_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_sign_payload_with_different_key_apex.asciipb new file mode 100644 index 00000000..4439653c --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_sign_payload_with_different_key_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_sign_payload_with_different_key.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_sign_payload_with_different_key.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_signed_bob_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_signed_bob_apex.asciipb new file mode 100644 index 00000000..3abbfcaa --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_signed_bob_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_signed_bob.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_signed_bob.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_signed_bob_rot_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_signed_bob_rot_apex.asciipb new file mode 100644 index 00000000..a7daf2cc --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_signed_bob_rot_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_signed_bob_rot.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_signed_bob_rot.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_signed_bob_rot_rollback_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_signed_bob_rot_rollback_apex.asciipb new file mode 100644 index 00000000..d77dde79 --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_signed_bob_rot_rollback_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_unsigned_apk_container_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_unsigned_apk_container_apex.asciipb new file mode 100644 index 00000000..2b38588f --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_unsigned_apk_container_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_unsigned_apk_container.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_unsigned_apk_container.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_unsigned_payload_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_unsigned_payload_apex.asciipb new file mode 100644 index 00000000..d2a28642 --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_unsigned_payload_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_unsigned_payload.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_unsigned_payload.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_with_post_install_hook_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_with_post_install_hook_apex.asciipb new file mode 100644 index 00000000..c377c9ad --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_with_post_install_hook_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_with_post_install_hook.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_with_post_install_hook.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_with_pre_install_hook_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_with_pre_install_hook_apex.asciipb new file mode 100644 index 00000000..61134be3 --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_with_pre_install_hook_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_with_pre_install_hook.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_with_pre_install_hook.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_without_apk_in_apex_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_without_apk_in_apex_apex.asciipb new file mode 100644 index 00000000..5947ed83 --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_without_apk_in_apex_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_without_apk_in_apex.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_without_apk_in_apex.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_wrong_sha_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_wrong_sha_apex.asciipb new file mode 100644 index 00000000..c23dcb2b --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v2_wrong_sha_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v2_wrong_sha.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v2_wrong_sha.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v3_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v3_apex.asciipb new file mode 100644 index 00000000..6d82a531 --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v3_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v3.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v3.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v3_rebootless_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v3_rebootless_apex.asciipb new file mode 100644 index 00000000..47cc8e94 --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v3_rebootless_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v3_rebootless.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v3_rebootless.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v3_signed_bob_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v3_signed_bob_apex.asciipb new file mode 100644 index 00000000..4c3db42f --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v3_signed_bob_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v3_signed_bob.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v3_signed_bob.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v3_signed_bob_rot_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v3_signed_bob_rot_apex.asciipb new file mode 100644 index 00000000..747285aa --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__riscv64_com_android_apex_cts_shim_v3_signed_bob_rot_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_riscv64/com.android.apex.cts.shim.v3_signed_bob_rot.apex" + } + dest_file: "shim/prebuilts//riscv64/com.android.apex.cts.shim.v3_signed_bob_rot.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_not_pre_installed_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_not_pre_installed_apex.asciipb index 1673a81c..23cc46a3 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_not_pre_installed_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_not_pre_installed_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim_not_pre_installed.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v1_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v1_apex.asciipb index 83580fe0..f800a0fd 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v1_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v1_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v1.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_additional_file_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_additional_file_apex.asciipb index 5c23eea4..e05e5850 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_additional_file_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_additional_file_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_additional_file.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_additional_folder_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_additional_folder_apex.asciipb index 36df5ad3..648a8313 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_additional_folder_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_additional_folder_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_additional_folder.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_apex.asciipb index c2d92421..1ccf5227 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v2.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_apk_in_apex_sdk_target_p_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_apk_in_apex_sdk_target_p_apex.asciipb index 92dba078..2ca5eda9 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_apk_in_apex_sdk_target_p_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_apk_in_apex_sdk_target_p_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_apk_in_apex_upgrades_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_apk_in_apex_upgrades_apex.asciipb index a3228fbf..3c3a55e1 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_apk_in_apex_upgrades_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_apk_in_apex_upgrades_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_apk_in_apex_upgrades.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_different_certificate_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_different_certificate_apex.asciipb index 15343010..54c9e7d7 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_different_certificate_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_different_certificate_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_different_certificate.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_different_package_name_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_different_package_name_apex.asciipb index b8e1de5f..3c80890b 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_different_package_name_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_different_package_name_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_different_package_name.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_install_constraints_empty_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_install_constraints_empty_apex.asciipb new file mode 100644 index 00000000..c5ccf5ee --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_install_constraints_empty_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_install_constraints_empty.apex" + } + dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v2_install_constraints_empty.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_install_constraints_invalid_fingerprint_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_install_constraints_invalid_fingerprint_apex.asciipb new file mode 100644 index 00000000..c4dcd22b --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_install_constraints_invalid_fingerprint_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_install_constraints_invalid_fingerprint.apex" + } + dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v2_install_constraints_invalid_fingerprint.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_install_constraints_no_value_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_install_constraints_no_value_apex.asciipb new file mode 100644 index 00000000..c632ecd3 --- /dev/null +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_install_constraints_no_value_apex.asciipb @@ -0,0 +1,15 @@ +drops { + android_build_drop { + build_id: "9653376" + target: "CtsShim" + source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_install_constraints_no_value.apex" + } + dest_file: "shim/prebuilts//x86/com.android.apex.cts.shim.v2_install_constraints_no_value.apex" + version: "" + version_group: "" + git_project: "platform/system/apex" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } +} diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_no_hashtree_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_no_hashtree_apex.asciipb index d9c58de8..78e59b7d 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_no_hashtree_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_no_hashtree_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_no_hashtree.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_rebootless_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_rebootless_apex.asciipb index 0c4bbda1..63ca1417 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_rebootless_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_rebootless_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_rebootless.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_sdk_target_p_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_sdk_target_p_apex.asciipb index 826a2384..7f3e54bd 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_sdk_target_p_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_sdk_target_p_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_sdk_target_p.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_sign_payload_with_different_key_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_sign_payload_with_different_key_apex.asciipb index 3199a49a..0c7340f2 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_sign_payload_with_different_key_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_sign_payload_with_different_key_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_sign_payload_with_different_key.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_apex.asciipb index eb0acfa2..4c4ff084 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_signed_bob.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_rot_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_rot_apex.asciipb index 19268fc8..f7bfc396 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_rot_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_rot_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_signed_bob_rot.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_rot_rollback_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_rot_rollback_apex.asciipb index c86aef6f..c4d501dc 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_rot_rollback_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_signed_bob_rot_rollback_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_unsigned_apk_container_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_unsigned_apk_container_apex.asciipb index 03634a97..04a847d9 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_unsigned_apk_container_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_unsigned_apk_container_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "6508977" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_unsigned_apk_container.apex" } @@ -8,5 +8,8 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "rvc-dev" + git_branch: "master" + transform: TRANSFORM_NONE + transform_options { + } } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_unsigned_payload_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_unsigned_payload_apex.asciipb index 1f0f41d6..6166c984 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_unsigned_payload_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_unsigned_payload_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_unsigned_payload.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_with_post_install_hook_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_with_post_install_hook_apex.asciipb index def0f0d3..bed51761 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_with_post_install_hook_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_with_post_install_hook_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_with_post_install_hook.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_with_pre_install_hook_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_with_pre_install_hook_apex.asciipb index 2a1c96fe..7edcb343 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_with_pre_install_hook_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_with_pre_install_hook_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_with_pre_install_hook.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_without_apk_in_apex_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_without_apk_in_apex_apex.asciipb index ad5a295b..d0e3e683 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_without_apk_in_apex_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_without_apk_in_apex_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_without_apk_in_apex.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_wrong_sha_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_wrong_sha_apex.asciipb index 21c2689e..617b9297 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_wrong_sha_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v2_wrong_sha_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v2_wrong_sha.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_apex.asciipb index 84113df3..ff01818a 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v3.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_rebootless_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_rebootless_apex.asciipb index cc3a4015..3a29a65f 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_rebootless_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_rebootless_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v3_rebootless.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_signed_bob_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_signed_bob_apex.asciipb index ab5a34e6..445f0670 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_signed_bob_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_signed_bob_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v3_signed_bob.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_signed_bob_rot_apex.asciipb b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_signed_bob_rot_apex.asciipb index 6d51168a..ba19a9ab 100644 --- a/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_signed_bob_rot_apex.asciipb +++ b/.prebuilt_info/prebuilt_info_shim_prebuilts__x86_com_android_apex_cts_shim_v3_signed_bob_rot_apex.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "8572644" + build_id: "9653376" target: "CtsShim" source_file: "aosp_x86_64/com.android.apex.cts.shim.v3_signed_bob_rot.apex" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/system/apex" - git_branch: "tm-dev" + git_branch: "master" transform: TRANSFORM_NONE transform_options { } diff --git a/apexd/apex_constants.h b/apexd/apex_constants.h index 74a9cf21..c8adf613 100644 --- a/apexd/apex_constants.h +++ b/apexd/apex_constants.h @@ -66,10 +66,16 @@ static constexpr const char* kApexStatusSysprop = "apexd.status"; static constexpr const char* kApexStatusStarting = "starting"; static constexpr const char* kApexStatusActivated = "activated"; static constexpr const char* kApexStatusReady = "ready"; + static constexpr const char* kMultiApexSelectPersistPrefix = "persist.vendor.apex."; static constexpr const char* kMultiApexSelectBootconfigPrefix = "ro.boot.vendor.apex."; +static const std::vector<std::string> kMultiApexSelectPrefix = { + // Check persist props first, to allow users to override bootconfig. + kMultiApexSelectPersistPrefix, + kMultiApexSelectBootconfigPrefix, +}; static constexpr const char* kVmPayloadMetadataPartitionProp = "apexd.payload_metadata.path"; diff --git a/apexd/apex_file_repository.h b/apexd/apex_file_repository.h index aa2a4cf4..bfddccf0 100644 --- a/apexd/apex_file_repository.h +++ b/apexd/apex_file_repository.h @@ -181,11 +181,8 @@ class ApexFileRepository final { // Prefixes used when looking for multi-installed APEX sysprops. // Order matters: the first non-empty prop value is returned. - std::vector<std::string> multi_install_select_prop_prefixes_ = { - // Check persist props first, to allow users to override bootconfig. - kMultiApexSelectPersistPrefix, - kMultiApexSelectBootconfigPrefix, - }; + std::vector<std::string> multi_install_select_prop_prefixes_ = + kMultiApexSelectPrefix; // Allows multi-install APEXes outside of expected partitions. // Only set false in tests. @@ -217,5 +214,8 @@ class ApexFileRepository final { std::unordered_map<std::string, BlockApexOverride> block_apex_overrides_; }; +std::string GetApexSelectFilenameFromProp( + const std::vector<std::string>& prefixes, const std::string& apex_name); + } // namespace apex } // namespace android diff --git a/apexd/apex_shim.cpp b/apexd/apex_shim.cpp index 441c971c..c8151b75 100644 --- a/apexd/apex_shim.cpp +++ b/apexd/apex_shim.cpp @@ -56,14 +56,17 @@ static constexpr const char* kExpectedCtsShimFiles[] = { "app/CtsShim@1/CtsShim.apk", "app/CtsShim@2/CtsShim.apk", "app/CtsShim@3/CtsShim.apk", + "app/CtsShim@AOSP.MASTER/CtsShim.apk", "app/CtsShimTargetPSdk/CtsShimTargetPSdk.apk", "app/CtsShimTargetPSdk@1/CtsShimTargetPSdk.apk", "app/CtsShimTargetPSdk@2/CtsShimTargetPSdk.apk", "app/CtsShimTargetPSdk@3/CtsShimTargetPSdk.apk", + "app/CtsShimTargetPSdk@AOSP.MASTER/CtsShimTargetPSdk.apk", "priv-app/CtsShimPriv/CtsShimPriv.apk", "priv-app/CtsShimPriv@1/CtsShimPriv.apk", "priv-app/CtsShimPriv@2/CtsShimPriv.apk", "priv-app/CtsShimPriv@3/CtsShimPriv.apk", + "priv-app/CtsShimPriv@AOSP.MASTER/CtsShimPriv.apk", }; Result<std::string> CalculateSha512(const std::string& path) { diff --git a/apexd/apexd.cpp b/apexd/apexd.cpp index 50b30da7..39a3d9a6 100644 --- a/apexd/apexd.cpp +++ b/apexd/apexd.cpp @@ -1788,8 +1788,14 @@ Result<void> ActivateApexPackages(const std::vector<ApexFileRef>& apexes, apex_queue.emplace(&apex); } - // Creates threads as many as half number of cores for the performance. - size_t worker_num = std::max(get_nprocs_conf() >> 1, 1); + size_t worker_num = + android::sysprop::ApexProperties::boot_activation_threads().value_or(0); + + // Setting number of workers to the number of packages to load + // This seems to provide the best performance + if (worker_num == 0) { + worker_num = apex_queue.size(); + } worker_num = std::min(apex_queue.size(), worker_num); // On -eng builds there might be two different pre-installed art apexes. @@ -3730,7 +3736,7 @@ int OnOtaChrootBootstrap() { return 0; } -int ActivateFlattenedApex() { +int ActivateFlattenedApex(const std::vector<std::string>& multi_apex_prefixes) { LOG(INFO) << "ActivateFlattenedApex"; std::vector<com::android::apex::ApexInfo> apex_infos; @@ -3767,6 +3773,21 @@ int ActivateFlattenedApex() { continue; } + // Support for multi-install-apex with flattened apexes works with "ro." + // property but not with "persist." property because "persist." properties + // are not loaded yet. + auto selected = + GetApexSelectFilenameFromProp(multi_apex_prefixes, manifest->name()); + if (!selected.empty()) { + if (selected != android::base::Basename(apex_dir)) { + LOG(INFO) << "Skipping APEX at " << apex_dir << " because " + << selected << " is selected for " << manifest->name(); + continue; + } + LOG(INFO) << "Selecting APEX at " << apex_dir << " for " + << manifest->name(); + } + if (auto it = apex_names.find(manifest->name()); it != apex_names.end()) { LOG(ERROR) << "Failed to activate apex from " << apex_dir << " : duplicate of " << manifest->name() << " found in " @@ -3834,6 +3855,10 @@ int ActivateFlattenedApex() { return 0; } +int ActivateFlattenedApex() { + return ActivateFlattenedApex(kMultiApexSelectPrefix); +} + android::apex::MountedApexDatabase& GetApexDatabaseForTesting() { return gMountedApexes; } diff --git a/apexd/apexd.h b/apexd/apexd.h index c30df4c3..09682e0b 100644 --- a/apexd/apexd.h +++ b/apexd/apexd.h @@ -217,6 +217,7 @@ int OnOtaChrootBootstrap(); // Activates flattened apexes int ActivateFlattenedApex(); +int ActivateFlattenedApex(const std::vector<std::string>& multi_apex_prefixes); android::apex::MountedApexDatabase& GetApexDatabaseForTesting(); diff --git a/apexd/apexd_loop.cpp b/apexd/apexd_loop.cpp index 0bdbd1e9..fcc8ca57 100644 --- a/apexd/apexd_loop.cpp +++ b/apexd/apexd_loop.cpp @@ -279,6 +279,8 @@ Result<void> PreAllocateLoopDevices(size_t num) { return ErrnoError() << "Failed to open loop-control"; } + int new_allocations = 0; // for logging purpose + // Assumption: loop device ID [0..num) is valid. // This is because pre-allocation happens during bootstrap. // Anyway Kernel pre-allocated loop devices @@ -288,7 +290,7 @@ Result<void> PreAllocateLoopDevices(size_t num) { for (size_t id = 0ul, cnt = 0; cnt < num; ++id) { int ret = ioctl(ctl_fd.get(), LOOP_CTL_ADD, id); if (ret > 0) { - LOG(INFO) << "Pre-allocated loop device " << id; + new_allocations++; cnt++; } else if (errno == EEXIST) { // When LOOP_CTL_ADD failed with EEXIST, it can check @@ -298,7 +300,6 @@ Result<void> PreAllocateLoopDevices(size_t num) { if (access(loop_device.c_str(), F_OK) == 0) { LOG(WARNING) << "Loop device " << id << " already in use"; } else { - LOG(INFO) << "Found preallocated loop device " << id; cnt++; } } else { @@ -313,7 +314,10 @@ Result<void> PreAllocateLoopDevices(size_t num) { // access them for activating APEXes. If the dev nodes are not ready // even then, we wait 50ms and warning message will be printed (see below // CreateLoopDevice()). - LOG(INFO) << "Pre-allocated " << num << " loopback devices"; + LOG(INFO) << "Found " << (num - new_allocations) + << " idle loopback devices that were " + << "pre-allocated by kernel. Allocated " << new_allocations + << " more."; return {}; } diff --git a/apexd/apexd_test.cpp b/apexd/apexd_test.cpp index 7fdf9eef..0b478b04 100644 --- a/apexd/apexd_test.cpp +++ b/apexd/apexd_test.cpp @@ -75,6 +75,7 @@ using ::apex::proto::SessionState; using com::android::apex::testing::ApexInfoXmlEq; using ::testing::ByRef; using ::testing::Contains; +using ::testing::ElementsAre; using ::testing::HasSubstr; using ::testing::IsEmpty; using ::testing::Not; @@ -3118,6 +3119,38 @@ TEST_F(ApexdMountTest, ActivateFlattenedApexShouldFailWithDuplicate) { HasSubstr("duplicate of com.android.apex.test_package found")); } +TEST_F(ApexdMountTest, ActivateFlattenedApexSupportsMultiApex) { + auto apex_dir = GetBuiltInDir() + "/com.android.apex.test_package"; + // Two flattened APEXes with the same name + PrepareFlattenedApex(apex_dir, "com.android.apex.test_package", 1); + PrepareFlattenedApex(apex_dir + "_something_else", + "com.android.apex.test_package", 1); + + // With sysprop indicating multi-apex + std::string property_prefix = "debug.apexd.test.persistprefix."; + android::base::SetProperty(property_prefix + "com.android.apex.test_package", + "com.android.apex.test_package"); + + ASSERT_EQ(ActivateFlattenedApex({property_prefix}), 0); // Succeeds + + // apex-info-list.xml should have original paths (realpaths) not symlinks + auto info_list = + com::android::apex::readApexInfoList("/apex/apex-info-list.xml"); + ASSERT_TRUE(info_list.has_value()); + auto apex_info = com::android::apex::ApexInfo( + /* moduleName= */ "com.android.apex.test_package", + /* modulePath= */ apex_dir, + /* preinstalledModulePath= */ apex_dir, + /* versionCode= */ 1, /* versionName= */ "1", + /* isFactory= */ true, /* isActive= */ true, + /* lastUpdateMillis= */ 0, + /* provideSharedApexLibs= */ false); + ASSERT_THAT(info_list->getApexInfo(), ElementsAre(ApexInfoXmlEq(apex_info))); + + android::base::SetProperty(property_prefix + "com.android.apex.test_package", + ""); +} + TEST_F(ApexdMountTest, ActivateFlattenedApexShouldHaveRealPaths) { // Prepare flattened apexes somewhere else TemporaryDir dir; diff --git a/apexd/sysprop/ApexProperties.sysprop b/apexd/sysprop/ApexProperties.sysprop index 288c3504..9f92a336 100644 --- a/apexd/sysprop/ApexProperties.sysprop +++ b/apexd/sysprop/ApexProperties.sysprop @@ -46,3 +46,15 @@ prop { access: Readonly prop_name: "apexd.config.loop_wait.attempts" } + +# This sysprop allows adjusting the number of threads that are used +# to activate Apex Packages. If this sysprop is not set or set to 0, +# the total number of threads equal the number of packages. +# The maximum number of threads is capped to the number of packages. +prop { + api_name: "boot_activation_threads" + type: UInt + scope: Internal + access: Readonly + prop_name: "apexd.config.boot_activation.threads" +} diff --git a/apexer/Android.bp b/apexer/Android.bp index ecf3acd5..812bc938 100644 --- a/apexer/Android.bp +++ b/apexer/Android.bp @@ -164,10 +164,12 @@ genrule { tools: apexer_deps_tools + [ // To force signapk.jar generated in out/host "signapk", + "bundletool", ], cmd: "HOST_OUT_BIN=$$(dirname $(location apexer)) && " + "HOST_SOONG_OUT=$$(dirname $$HOST_OUT_BIN) && " + "SIGNAPK_JAR=$$(find $${HOST_SOONG_OUT}/framework -name \"signapk*\") && " + + "BUNDLETOOL_JAR=$$(find $${HOST_SOONG_OUT}/framework -name \"bundletool*.jar\") && " + "LIBCPLUSPLUS=$$(find $${HOST_SOONG_OUT}/lib64 -name \"libc++.*\") && " + "LIBCONSCRYPT_OPENJDK_JNI=$$(find $${HOST_SOONG_OUT}/lib64 -name \"libconscrypt_openjdk_jni.*\") && " + "BASE=$(genDir)/binary_files && " + @@ -193,6 +195,7 @@ genrule { "cp $(location blkid) $$BIN && " + "cp $(location fsck.erofs) $$BIN && " + "cp $$SIGNAPK_JAR $$BIN && " + + "cp $$BUNDLETOOL_JAR $$BIN && " + "cp $$LIBCPLUSPLUS $$LIB && " + "cp $$LIBCONSCRYPT_OPENJDK_JNI $$LIB && " + "$(location soong_zip) -C $$BASE -D $$BASE -o $(out) && " + diff --git a/shim/Android.bp b/shim/Android.bp index 9f0ea897..d51e7bc9 100644 --- a/shim/Android.bp +++ b/shim/Android.bp @@ -29,6 +29,9 @@ prebuilt_apex { arm64: { src: "prebuilts/arm/com.android.apex.cts.shim.v1.apex", }, + riscv64: { + src: "prebuilts/riscv64/com.android.apex.cts.shim.v1.apex", + }, x86: { src: "prebuilts/x86/com.android.apex.cts.shim.v1.apex", }, @@ -50,6 +53,9 @@ prebuilt_apex { arm64: { src: "prebuilts/arm/com.android.apex.cts.shim.v2.apex", }, + riscv64: { + src: "prebuilts/riscv64/com.android.apex.cts.shim.v2.apex", + }, x86: { src: "prebuilts/x86/com.android.apex.cts.shim.v2.apex", }, @@ -70,6 +76,9 @@ prebuilt_apex { arm64: { src: "prebuilts/arm/com.android.apex.cts.shim.v2_wrong_sha.apex", }, + riscv64: { + src: "prebuilts/riscv64/com.android.apex.cts.shim.v2_wrong_sha.apex", + }, x86: { src: "prebuilts/x86/com.android.apex.cts.shim.v2_wrong_sha.apex", }, @@ -90,6 +99,9 @@ prebuilt_apex { arm64: { src: "prebuilts/arm/com.android.apex.cts.shim.v2_additional_file.apex", }, + riscv64: { + src: "prebuilts/riscv64/com.android.apex.cts.shim.v2_additional_file.apex", + }, x86: { src: "prebuilts/x86/com.android.apex.cts.shim.v2_additional_file.apex", }, @@ -110,6 +122,9 @@ prebuilt_apex { arm64: { src: "prebuilts/arm/com.android.apex.cts.shim.v2_additional_folder.apex", }, + riscv64: { + src: "prebuilts/riscv64/com.android.apex.cts.shim.v2_additional_folder.apex", + }, x86: { src: "prebuilts/x86/com.android.apex.cts.shim.v2_additional_folder.apex", }, @@ -130,6 +145,9 @@ prebuilt_apex { arm64: { src: "prebuilts/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex", }, + riscv64: { + src: "prebuilts/riscv64/com.android.apex.cts.shim.v2_with_pre_install_hook.apex", + }, x86: { src: "prebuilts/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex", }, @@ -150,6 +168,9 @@ prebuilt_apex { arm64: { src: "prebuilts/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex", }, + riscv64: { + src: "prebuilts/riscv64/com.android.apex.cts.shim.v2_with_post_install_hook.apex", + }, x86: { src: "prebuilts/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex", }, @@ -170,6 +191,9 @@ prebuilt_apex { arm64: { src: "prebuilts/arm/com.android.apex.cts.shim.v3.apex", }, + riscv64: { + src: "prebuilts/riscv64/com.android.apex.cts.shim.v3.apex", + }, x86: { src: "prebuilts/x86/com.android.apex.cts.shim.v3.apex", }, @@ -190,6 +214,9 @@ prebuilt_apex { arm64: { src: "prebuilts/arm/com.android.apex.cts.shim.v2_different_certificate.apex", }, + riscv64: { + src: "prebuilts/riscv64/com.android.apex.cts.shim.v2_different_certificate.apex", + }, x86: { src: "prebuilts/x86/com.android.apex.cts.shim.v2_different_certificate.apex", }, @@ -210,6 +237,9 @@ prebuilt_apex { arm64: { src: "prebuilts/arm/com.android.apex.cts.shim.v2_unsigned_apk_container.apex", }, + riscv64: { + src: "prebuilts/riscv64/com.android.apex.cts.shim.v2_unsigned_apk_container.apex", + }, x86: { src: "prebuilts/x86/com.android.apex.cts.shim.v2_unsigned_apk_container.apex", }, diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v1.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v1.apex Binary files differindex c2dc28fe..1274c4bf 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v1.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v1.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2.apex Binary files differindex 880ab4a3..2369c77e 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_file.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_file.apex Binary files differindex 8c84cd5f..2cca9dd5 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_file.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_file.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_folder.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_folder.apex Binary files differindex b519bbe5..af85a7db 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_folder.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_additional_folder.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex Binary files differindex 38e23397..35cb546c 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_apk_in_apex_upgrades.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_apk_in_apex_upgrades.apex Binary files differindex 3d7bf515..713a82d4 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_apk_in_apex_upgrades.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_apk_in_apex_upgrades.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_certificate.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_certificate.apex Binary files differindex f4bc7e89..feffcca1 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_certificate.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_certificate.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_package_name.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_package_name.apex Binary files differindex 59e9fe14..f5ca9000 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_package_name.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_different_package_name.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_install_constraints_empty.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_install_constraints_empty.apex Binary files differnew file mode 100644 index 00000000..83aca074 --- /dev/null +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_install_constraints_empty.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_install_constraints_invalid_fingerprint.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_install_constraints_invalid_fingerprint.apex Binary files differnew file mode 100644 index 00000000..c8dde262 --- /dev/null +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_install_constraints_invalid_fingerprint.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_install_constraints_no_value.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_install_constraints_no_value.apex Binary files differnew file mode 100644 index 00000000..7c473848 --- /dev/null +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_install_constraints_no_value.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_no_hashtree.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_no_hashtree.apex Binary files differindex 353949b8..fdb6dc96 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_no_hashtree.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_no_hashtree.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_rebootless.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_rebootless.apex Binary files differindex c39b7902..1254cff5 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_rebootless.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_rebootless.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_sdk_target_p.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_sdk_target_p.apex Binary files differindex da25328c..d998bbc3 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_sdk_target_p.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_sdk_target_p.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_sign_payload_with_different_key.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_sign_payload_with_different_key.apex Binary files differindex 3eaf3726..568de834 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_sign_payload_with_different_key.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_sign_payload_with_different_key.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob.apex Binary files differindex 6f382739..c33182a4 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot.apex Binary files differindex 19697463..e3c1fcfb 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex Binary files differindex be642bf4..3dd9ac20 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_unsigned_payload.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_unsigned_payload.apex Binary files differindex 7bebb778..7af5095f 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_unsigned_payload.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_unsigned_payload.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex Binary files differindex 8006022a..62a0a326 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex Binary files differindex 3465dbb3..7052ce3b 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_without_apk_in_apex.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_without_apk_in_apex.apex Binary files differindex 67743a94..e0a89c9a 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_without_apk_in_apex.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_without_apk_in_apex.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_wrong_sha.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_wrong_sha.apex Binary files differindex aa1c10c1..0a1cec47 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v2_wrong_sha.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v2_wrong_sha.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v3.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v3.apex Binary files differindex b345bca9..a9dc78f8 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v3.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v3.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v3_rebootless.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v3_rebootless.apex Binary files differindex c3bab7cd..e71e3f23 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v3_rebootless.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v3_rebootless.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob.apex Binary files differindex 4733badf..984272ff 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob_rot.apex b/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob_rot.apex Binary files differindex 6972daa6..4e97e209 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob_rot.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim.v3_signed_bob_rot.apex diff --git a/shim/prebuilts/arm/com.android.apex.cts.shim_not_pre_installed.apex b/shim/prebuilts/arm/com.android.apex.cts.shim_not_pre_installed.apex Binary files differindex 4cda1c6c..deb1d5e8 100644 --- a/shim/prebuilts/arm/com.android.apex.cts.shim_not_pre_installed.apex +++ b/shim/prebuilts/arm/com.android.apex.cts.shim_not_pre_installed.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v1.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v1.apex Binary files differnew file mode 100644 index 00000000..1984240f --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v1.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2.apex Binary files differnew file mode 100644 index 00000000..637abc0e --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_additional_file.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_additional_file.apex Binary files differnew file mode 100644 index 00000000..ea9dbbda --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_additional_file.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_additional_folder.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_additional_folder.apex Binary files differnew file mode 100644 index 00000000..efac704f --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_additional_folder.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex Binary files differnew file mode 100644 index 00000000..ade5ad1b --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_apk_in_apex_upgrades.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_apk_in_apex_upgrades.apex Binary files differnew file mode 100644 index 00000000..08785cab --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_apk_in_apex_upgrades.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_different_certificate.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_different_certificate.apex Binary files differnew file mode 100644 index 00000000..4c109f04 --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_different_certificate.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_different_package_name.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_different_package_name.apex Binary files differnew file mode 100644 index 00000000..45f60a52 --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_different_package_name.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_install_constraints_empty.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_install_constraints_empty.apex Binary files differnew file mode 100644 index 00000000..6cd415bc --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_install_constraints_empty.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_install_constraints_invalid_fingerprint.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_install_constraints_invalid_fingerprint.apex Binary files differnew file mode 100644 index 00000000..430e8c6b --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_install_constraints_invalid_fingerprint.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_install_constraints_no_value.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_install_constraints_no_value.apex Binary files differnew file mode 100644 index 00000000..0e267973 --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_install_constraints_no_value.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_no_hashtree.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_no_hashtree.apex Binary files differnew file mode 100644 index 00000000..ef6212fe --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_no_hashtree.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_rebootless.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_rebootless.apex Binary files differnew file mode 100644 index 00000000..eb8292a7 --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_rebootless.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_sdk_target_p.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_sdk_target_p.apex Binary files differnew file mode 100644 index 00000000..c2a48dc5 --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_sdk_target_p.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_sign_payload_with_different_key.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_sign_payload_with_different_key.apex Binary files differnew file mode 100644 index 00000000..46d091f8 --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_sign_payload_with_different_key.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_signed_bob.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_signed_bob.apex Binary files differnew file mode 100644 index 00000000..e7072f29 --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_signed_bob.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_signed_bob_rot.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_signed_bob_rot.apex Binary files differnew file mode 100644 index 00000000..328727c3 --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_signed_bob_rot.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex Binary files differnew file mode 100644 index 00000000..cfef97d2 --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_unsigned_apk_container.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_unsigned_apk_container.apex Binary files differnew file mode 100644 index 00000000..39fcd46d --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_unsigned_apk_container.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_unsigned_payload.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_unsigned_payload.apex Binary files differnew file mode 100644 index 00000000..2c2f2415 --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_unsigned_payload.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_with_post_install_hook.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_with_post_install_hook.apex Binary files differnew file mode 100644 index 00000000..d8854ae8 --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_with_post_install_hook.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_with_pre_install_hook.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_with_pre_install_hook.apex Binary files differnew file mode 100644 index 00000000..0d3e0370 --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_with_pre_install_hook.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_without_apk_in_apex.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_without_apk_in_apex.apex Binary files differnew file mode 100644 index 00000000..e71c663e --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_without_apk_in_apex.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_wrong_sha.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_wrong_sha.apex Binary files differnew file mode 100644 index 00000000..450c7430 --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v2_wrong_sha.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v3.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v3.apex Binary files differnew file mode 100644 index 00000000..47d022fb --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v3.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v3_rebootless.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v3_rebootless.apex Binary files differnew file mode 100644 index 00000000..ec352734 --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v3_rebootless.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v3_signed_bob.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v3_signed_bob.apex Binary files differnew file mode 100644 index 00000000..784b55ca --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v3_signed_bob.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim.v3_signed_bob_rot.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v3_signed_bob_rot.apex Binary files differnew file mode 100644 index 00000000..6dde66fa --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim.v3_signed_bob_rot.apex diff --git a/shim/prebuilts/riscv64/com.android.apex.cts.shim_not_pre_installed.apex b/shim/prebuilts/riscv64/com.android.apex.cts.shim_not_pre_installed.apex Binary files differnew file mode 100644 index 00000000..0c76bca9 --- /dev/null +++ b/shim/prebuilts/riscv64/com.android.apex.cts.shim_not_pre_installed.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v1.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v1.apex Binary files differindex 030c53bf..758b0279 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v1.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v1.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2.apex Binary files differindex b090a96c..1437186e 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_file.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_file.apex Binary files differindex c498b323..23368d4c 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_file.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_file.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_folder.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_folder.apex Binary files differindex e83ec07b..45f52344 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_folder.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_additional_folder.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex Binary files differindex 4545b1c5..67fd560f 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_apk_in_apex_upgrades.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_apk_in_apex_upgrades.apex Binary files differindex 298fd855..b9c48e6d 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_apk_in_apex_upgrades.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_apk_in_apex_upgrades.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_certificate.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_certificate.apex Binary files differindex d911fe03..c0542ec4 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_certificate.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_certificate.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_package_name.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_package_name.apex Binary files differindex 053df91a..cc00cd05 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_package_name.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_different_package_name.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_install_constraints_empty.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_install_constraints_empty.apex Binary files differnew file mode 100644 index 00000000..5b91151d --- /dev/null +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_install_constraints_empty.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_install_constraints_invalid_fingerprint.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_install_constraints_invalid_fingerprint.apex Binary files differnew file mode 100644 index 00000000..977e2175 --- /dev/null +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_install_constraints_invalid_fingerprint.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_install_constraints_no_value.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_install_constraints_no_value.apex Binary files differnew file mode 100644 index 00000000..39ed540e --- /dev/null +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_install_constraints_no_value.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_no_hashtree.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_no_hashtree.apex Binary files differindex 65a54738..e2e974de 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_no_hashtree.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_no_hashtree.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_rebootless.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_rebootless.apex Binary files differindex 9f94684d..d8d04275 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_rebootless.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_rebootless.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_sdk_target_p.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_sdk_target_p.apex Binary files differindex 8fd510cf..3a92d629 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_sdk_target_p.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_sdk_target_p.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_sign_payload_with_different_key.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_sign_payload_with_different_key.apex Binary files differindex baae3e3d..40fef277 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_sign_payload_with_different_key.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_sign_payload_with_different_key.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob.apex Binary files differindex 1e807887..f640f868 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot.apex Binary files differindex c0649289..a7aff9d5 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex Binary files differindex 685f347f..9cee267a 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_unsigned_payload.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_unsigned_payload.apex Binary files differindex f2329ae0..dcc7f773 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_unsigned_payload.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_unsigned_payload.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex Binary files differindex bb2d96ef..4651714b 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex Binary files differindex fd00bd5a..8f51e35c 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_without_apk_in_apex.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_without_apk_in_apex.apex Binary files differindex e7da6532..8c72ec1c 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_without_apk_in_apex.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_without_apk_in_apex.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_wrong_sha.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_wrong_sha.apex Binary files differindex 32bf141a..ac93bd89 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v2_wrong_sha.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v2_wrong_sha.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v3.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v3.apex Binary files differindex 1bd8b1b9..d76c6d2f 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v3.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v3.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v3_rebootless.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v3_rebootless.apex Binary files differindex 2f7a2e56..faf38cca 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v3_rebootless.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v3_rebootless.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob.apex Binary files differindex 38fe0195..9d9e4906 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob_rot.apex b/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob_rot.apex Binary files differindex 68505d5f..f76aa01e 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob_rot.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim.v3_signed_bob_rot.apex diff --git a/shim/prebuilts/x86/com.android.apex.cts.shim_not_pre_installed.apex b/shim/prebuilts/x86/com.android.apex.cts.shim_not_pre_installed.apex Binary files differindex 7fd07b54..128fb8f5 100644 --- a/shim/prebuilts/x86/com.android.apex.cts.shim_not_pre_installed.apex +++ b/shim/prebuilts/x86/com.android.apex.cts.shim_not_pre_installed.apex diff --git a/tests/OWNERS b/tests/OWNERS index bd8dc365..71f225ae 100644 --- a/tests/OWNERS +++ b/tests/OWNERS @@ -1,5 +1,5 @@ # Bug component: 494373 chenzhu@google.com jiyong@google.com -satayev@google.com +robertogil@google.com yuwu@google.com diff --git a/tests/testdata/vendorapex/Android.bp b/tests/testdata/vendorapex/Android.bp index bb66192b..f678c323 100644 --- a/tests/testdata/vendorapex/Android.bp +++ b/tests/testdata/vendorapex/Android.bp @@ -111,6 +111,13 @@ prebuilt_etc { src: "apex_vendor_foo_v2.rc", } +prebuilt_etc { + name: "apex_vendor_foo_v2_vintf", + src: "apex_vendor_foo_v2.xml", + relative_install_path: "vintf", + installable: false, +} + apex { name: "com.android.apex.vendor.foo.v1_with_service", defaults: [ @@ -154,3 +161,18 @@ genrule { tools: ["jsonmodify"], cmd: "$(location jsonmodify) -v vndkVersion WrongVndkVersion $(in) -o $(out)", } + +apex { + name: "com.android.apex.vendor.foo.with_vintf", + defaults: [ + "com.android.apex.vendor.foo.defaults", + ], + manifest: "manifest_v2.json", + binaries: [ + "apex_vendor_foo", + ], + prebuilts: [ + "apex_vendor_foo_v2.rc", + "apex_vendor_foo_v2_vintf", + ], +} diff --git a/tests/testdata/vendorapex/apex_vendor_foo_v1.rc b/tests/testdata/vendorapex/apex_vendor_foo_v1.rc index 9e00aae8..f159691e 100644 --- a/tests/testdata/vendorapex/apex_vendor_foo_v1.rc +++ b/tests/testdata/vendorapex/apex_vendor_foo_v1.rc @@ -4,3 +4,4 @@ on property:apex.com.android.apex.vendor.foo.ready=true service apex_vendor_foo_v1 /apex/com.android.apex.vendor.foo/bin/apex_vendor_foo class hal + user root diff --git a/tests/testdata/vendorapex/apex_vendor_foo_v2.rc b/tests/testdata/vendorapex/apex_vendor_foo_v2.rc index c2670fbc..087bd73f 100644 --- a/tests/testdata/vendorapex/apex_vendor_foo_v2.rc +++ b/tests/testdata/vendorapex/apex_vendor_foo_v2.rc @@ -4,3 +4,4 @@ on property:apex.com.android.apex.vendor.foo.ready=true service apex_vendor_foo_v2 /apex/com.android.apex.vendor.foo/bin/apex_vendor_foo class hal + user root diff --git a/tests/testdata/vendorapex/apex_vendor_foo_v2.xml b/tests/testdata/vendorapex/apex_vendor_foo_v2.xml new file mode 100644 index 00000000..4c725008 --- /dev/null +++ b/tests/testdata/vendorapex/apex_vendor_foo_v2.xml @@ -0,0 +1,6 @@ +<manifest version="1.0" type="device"> + <hal format="aidl" > + <name>android.apex.foo</name> + <fqname>IApex/default</fqname> + </hal> +</manifest> diff --git a/tools/deapexer.py b/tools/deapexer.py index 83fb35cf..4f58df71 100755 --- a/tools/deapexer.py +++ b/tools/deapexer.py @@ -37,8 +37,8 @@ BLOCK_SIZE = 4096 class ApexImageEntry(object): - def __init__(self, name, base_dir, permissions, size, ino, extents, is_directory=False, - is_symlink=False): + def __init__(self, name, base_dir, permissions, size, ino, extents, + is_directory, is_symlink, security_context): self._name = name self._base_dir = base_dir self._permissions = permissions @@ -47,14 +47,24 @@ class ApexImageEntry(object): self._is_symlink = is_symlink self._ino = ino self._extents = extents + self._security_context = security_context @property def name(self): return self._name @property + def root(self): + return self._base_dir == './' and self._name == '.' + + @property def full_path(self): - return os.path.join(self._base_dir, self._name) + if self.root: + return self._base_dir # './' + path = os.path.join(self._base_dir, self._name) + if self.is_directory: + path += '/' + return path @property def is_directory(self): @@ -84,6 +94,10 @@ class ApexImageEntry(object): def extents(self): return self._extents + @property + def security_context(self): + return self._security_context + def __str__(self): ret = '' if self._is_directory: @@ -201,9 +215,25 @@ class Apex(object): except: extents = [] # [] means that we failed to retrieve the file location successfully - entries.append(ApexImageEntry(name, base_dir=path, permissions=int(bits[3:], 8), size=size, - is_directory=is_directory, is_symlink=is_symlink, ino=ino, - extents=extents)) + # get 'security.selinux' attribute + entry_path = os.path.join(path, name) + stdout = subprocess.check_output([ + self._debugfs, + '-R', + f'ea_get -V {entry_path} security.selinux', + self._payload + ], text=True, stderr=subprocess.DEVNULL) + security_context = stdout.rstrip('\n\x00') + + entries.append(ApexImageEntry(name, + base_dir=path, + permissions=int(bits[3:], 8), + size=size, + is_directory=is_directory, + is_symlink=is_symlink, + ino=ino, + extents=extents, + security_context=security_context)) return ApexImageDirectory(path, entries, self) @@ -242,14 +272,17 @@ def RunList(args): with Apex(args) as apex: for e in apex.list(is_recursive=True): - if e.is_directory: - continue + # dot(., ..) directories + if not e.root and e.name in ('.', '..'): + continue res = '' if args.size: res += e.size + ' ' res += e.full_path if args.extents: res += ' [' + '-'.join(str(x) for x in e.extents) + ']' + if args.contexts: + res += ' ' + e.security_context print(res) @@ -355,6 +388,9 @@ def main(argv): parser_list.add_argument('apex', type=str, help='APEX file') parser_list.add_argument('--size', help='also show the size of the files', action="store_true") parser_list.add_argument('--extents', help='also show the location of the files', action="store_true") + parser_list.add_argument('-Z', '--contexts', + help='also show the security context of the files', + action='store_true') parser_list.set_defaults(func=RunList) parser_extract = subparsers.add_parser('extract', help='extracts content of an APEX to the given ' |