commit 2520d44e664049f67f56795bedf5cc1d0494cc44
author Nicolas Geoffray <ngeoffray@google.com> Fri May 05 14:32:51 2017 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Thu May 11 09:47:24 2017 +0000
tree 9c995c1892242f5f107a3d94ee680160f11be8ed
parent 89726a1deaca6646e1641e0358186a0a19374dc7

Remove obsolete DEXOPT_SAFEMODE.

installd side of the change.

bug:37929796
Test: build
Change-Id: I358c0784a7b563cbd6ceaecdb80710971f483d02
(cherry picked from commit bad623a225d0b3d94f30f8654bd4684969e90d4c)

cmds/installd/otapreopt.cpp

diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp
index 9a3fb70..43d0780 100644
--- a/cmds/installd/otapreopt.cpp
+++ b/cmds/installd/otapreopt.cpp
@@ -472,7 +472,8 @@
                 case 6: {
                     // Version 1 had:
                     constexpr int OLD_DEXOPT_PUBLIC         = 1 << 1;
-                    constexpr int OLD_DEXOPT_SAFEMODE       = 1 << 2;
+                    // Note: DEXOPT_SAFEMODE has been removed.
+                    // constexpr int OLD_DEXOPT_SAFEMODE       = 1 << 2;
                     constexpr int OLD_DEXOPT_DEBUGGABLE     = 1 << 3;
                     constexpr int OLD_DEXOPT_BOOTCOMPLETE   = 1 << 4;
                     constexpr int OLD_DEXOPT_PROFILE_GUIDED = 1 << 5;
@@ -480,7 +481,6 @@
                     int input = atoi(param);
                     package_parameters_.dexopt_flags =
                             ReplaceMask(input, OLD_DEXOPT_PUBLIC, DEXOPT_PUBLIC) |
-                            ReplaceMask(input, OLD_DEXOPT_SAFEMODE, DEXOPT_SAFEMODE) |
                             ReplaceMask(input, OLD_DEXOPT_DEBUGGABLE, DEXOPT_DEBUGGABLE) |
                             ReplaceMask(input, OLD_DEXOPT_BOOTCOMPLETE, DEXOPT_BOOTCOMPLETE) |
                             ReplaceMask(input, OLD_DEXOPT_PROFILE_GUIDED, DEXOPT_PROFILE_GUIDED) |