commit 80a1403c624bf6f39763c8ad002512cbc651f76e
author David Sehr <sehr@google.com> Wed Apr 15 22:11:24 2020 -0700
committer David Sehr <sehr@google.com> Sun Apr 19 12:09:38 2020 -0700
tree 5943c11228ade4ad941e82b44f820b41477b018e
parent 018214dd8e6eaacfad0157fc71212be4d0f1efc0

Control use of dex2oat64 by device property

Gate use of dex2oat64 by a device property.

Bug: 153380900
Test: atest -c  installd_dexopt_test
Change-Id: I640085b5cd744cdc4563f565f8a914f9b1adc3ab

apex/com.android.art.release-file_contexts

diff --git a/apex/com.android.art.release-file_contexts b/apex/com.android.art.release-file_contexts
index 08688fb..1598afd 100644
--- a/apex/com.android.art.release-file_contexts
+++ b/apex/com.android.art.release-file_contexts
@@ -2,7 +2,7 @@
 # System files
 #
 (/.*)?                   u:object_r:system_file:s0
-/bin/dex2oat             u:object_r:dex2oat_exec:s0
+/bin/dex2oat(32|64)?     u:object_r:dex2oat_exec:s0
 /bin/dexoptanalyzer      u:object_r:dexoptanalyzer_exec:s0
 /bin/profman             u:object_r:profman_exec:s0
 /lib(64)?(/.*)?          u:object_r:system_lib_file:s0