diff options
author | 2019-12-14 02:07:16 +0000 | |
---|---|---|
committer | 2019-12-14 02:07:16 +0000 | |
commit | ac68248051e778708f665e16ed364103a6f9897c (patch) | |
tree | 5b4be4cfb8a2c00fcf07f3a81a1e2cf4031c0fd3 /apex/apex.go | |
parent | a2fce65a9e523f2090eae600086dc1b9dff057fd (diff) | |
parent | 214bf37311d0f376ccfdcc784bd8a0d9b60fb600 (diff) |
Merge "Add "legacy_android10_support" to "apex""
Diffstat (limited to 'apex/apex.go')
-rw-r--r-- | apex/apex.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/apex/apex.go b/apex/apex.go index 16bac94fe..be86d8060 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -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 |