Merge "Add "legacy_android10_support" to "apex""
This commit is contained in:
10
apex/apex.go
10
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
|
||||
|
Reference in New Issue
Block a user