Move change from ag/7565384 aside
Commit I35d35016680379e3a9363408704ee890a78a9748 is not yet in AOSP and is causing a merge conflict with my change aosp/1105757. Move the lines causing the conflict elsewhere. Bug: 1105489 Test: treehugger Change-Id: I35dca026e40c9e2f89b831395db3958e399bfbb7
This commit is contained in:
parent
fdc17e034e
commit
1da93c9f32
1 changed files with 4 additions and 4 deletions
|
@ -2,6 +2,10 @@ typeattribute installd coredomain;
|
|||
|
||||
init_daemon_domain(installd)
|
||||
|
||||
# Run migrate_legacy_obb_data.sh in its own sandbox.
|
||||
domain_auto_trans(installd, migrate_legacy_obb_data_exec, migrate_legacy_obb_data)
|
||||
allow installd shell_exec:file rx_file_perms;
|
||||
|
||||
# Run dex2oat in its own sandbox.
|
||||
domain_auto_trans(installd, dex2oat_exec, dex2oat)
|
||||
|
||||
|
@ -17,10 +21,6 @@ domain_auto_trans(installd, profman_exec, profman)
|
|||
# Run idmap in its own sandbox.
|
||||
domain_auto_trans(installd, idmap_exec, idmap)
|
||||
|
||||
# Run migrate_legacy_obb_data.sh in its own sandbox.
|
||||
domain_auto_trans(installd, migrate_legacy_obb_data_exec, migrate_legacy_obb_data)
|
||||
allow installd shell_exec:file rx_file_perms;
|
||||
|
||||
# Create /data/.layout_version.* file
|
||||
type_transition installd system_data_file:file install_data_file;
|
||||
|
||||
|
|
Loading…
Reference in a new issue