Merge "Add "legacy_android10_support" to "apex""

This commit is contained in:
Treehugger Robot
2019-12-14 02:07:16 +00:00
committed by Gerrit Code Review
3 changed files with 71 additions and 45 deletions

View File

@@ -343,6 +343,10 @@ type apexBundleProperties struct {
// Whenever apex_payload.img of the APEX should include dm-verity hashtree.
// Should be only used in tests#.
Test_only_no_hashtree *bool
// Whether this APEX should support Android10. Default is false. If this is set true, then apex_manifest.json is bundled as well
// because Android10 requires legacy apex_manifest.json instead of apex_manifest.pb
Legacy_android10_support *bool
}
type apexTargetBundleProperties struct {
@@ -507,10 +511,8 @@ type apexBundle struct {
artApex bool
primaryApexType bool
// intermediate path for apex_manifest.json
manifestJsonOut android.WritablePath
manifestJsonFullOut android.WritablePath
manifestPbOut android.WritablePath
manifestJsonOut android.WritablePath
manifestPbOut android.WritablePath
// list of commands to create symlinks for backward compatibility
// these commands will be attached as LOCAL_POST_INSTALL_CMD to