diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2017-05-11 09:42:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-05-11 09:42:25 +0000 |
| commit | 4fa2b96d212d20ee835de7068b4c4f2748c25cc4 (patch) | |
| tree | cc8e617d06284df462863ed67fe8e97ae57d1e89 | |
| parent | 8d2f788a05fe38c439653429cdf8d5dac6c51258 (diff) | |
| parent | ea694c6267a261dcd6580ee69bb590db21cbb9af (diff) | |
| download | native-4fa2b96d212d20ee835de7068b4c4f2748c25cc4.tar.gz | |
Merge "Remove obsolete DEXOPT_SAFEMODE."
| -rw-r--r-- | cmds/installd/installd_constants.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/cmds/installd/installd_constants.h b/cmds/installd/installd_constants.h index d8a754cc9b..6a81cfc34a 100644 --- a/cmds/installd/installd_constants.h +++ b/cmds/installd/installd_constants.h @@ -38,23 +38,21 @@ constexpr size_t PKG_PATH_MAX = 256u; /* max size of any path we use */ * frameworks/base/services/core/java/com/android/server/pm/Installer.java ***************************************************************************/ constexpr int DEXOPT_PUBLIC = 1 << 1; -constexpr int DEXOPT_SAFEMODE = 1 << 2; -constexpr int DEXOPT_DEBUGGABLE = 1 << 3; -constexpr int DEXOPT_BOOTCOMPLETE = 1 << 4; -constexpr int DEXOPT_PROFILE_GUIDED = 1 << 5; -constexpr int DEXOPT_SECONDARY_DEX = 1 << 6; +constexpr int DEXOPT_DEBUGGABLE = 1 << 2; +constexpr int DEXOPT_BOOTCOMPLETE = 1 << 3; +constexpr int DEXOPT_PROFILE_GUIDED = 1 << 4; +constexpr int DEXOPT_SECONDARY_DEX = 1 << 5; // DEXOPT_FORCE, DEXOPT_STORAGE_CE, DEXOPT_STORAGE_DE are exposed for secondary // dex files only. Primary apks are analyzed in PackageManager and installd // does not need to know if the compilation is forced or on what kind of storage // the dex files are. -constexpr int DEXOPT_FORCE = 1 << 7; -constexpr int DEXOPT_STORAGE_CE = 1 << 8; -constexpr int DEXOPT_STORAGE_DE = 1 << 9; +constexpr int DEXOPT_FORCE = 1 << 6; +constexpr int DEXOPT_STORAGE_CE = 1 << 7; +constexpr int DEXOPT_STORAGE_DE = 1 << 8; /* all known values for dexopt flags */ constexpr int DEXOPT_MASK = DEXOPT_PUBLIC - | DEXOPT_SAFEMODE | DEXOPT_DEBUGGABLE | DEXOPT_BOOTCOMPLETE | DEXOPT_PROFILE_GUIDED |