aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao2016-11-03 13:37:15 -0500
committerTao Bao2016-11-03 13:57:46 -0500
commitac9d94d19c5f0e8c769d2368790df679c665ea34 (patch)
treef6121362d8836f34d5e05aca8f7bd9d89d278365 /install.h
parent4011bb161a60fb04fb0d4c4c3e1090d43fcdd9e4 (diff)
downloadplatform-bootable-recovery-ac9d94d19c5f0e8c769d2368790df679c665ea34.tar.gz
platform-bootable-recovery-ac9d94d19c5f0e8c769d2368790df679c665ea34.tar.xz
platform-bootable-recovery-ac9d94d19c5f0e8c769d2368790df679c665ea34.zip
Revert "Revert "Some cleanups to recovery.""
This reverts commit 8584fcf677dd45b30121bd0490b06297e6be1871. This CL re-lands commit c0319b60f56d445c2d1c74f551e01f069b028fe6. The "stage" and "reason" variables are now declared as global by dropping the static qualifier, because they may be used by vendor recovery libraries. Test: lunch aosp_angler-userdebug; mmma bootable/recovery Test: lunch aosp_dragon-userdebug; mmma bootable/recovery Change-Id: I252c346f450079478cff22bbff01590b8ab2e2b3
Diffstat (limited to 'install.h')
-rw-r--r--install.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/install.h b/install.h
index 7f66a51c..1ec01e81 100644
--- a/install.h
+++ b/install.h
@@ -20,10 +20,9 @@
20#include <string> 20#include <string>
21#include <ziparchive/zip_archive.h> 21#include <ziparchive/zip_archive.h>
22 22
23#include "common.h"
24
25enum { INSTALL_SUCCESS, INSTALL_ERROR, INSTALL_CORRUPT, INSTALL_NONE, INSTALL_SKIPPED, 23enum { INSTALL_SUCCESS, INSTALL_ERROR, INSTALL_CORRUPT, INSTALL_NONE, INSTALL_SKIPPED,
26 INSTALL_RETRY }; 24 INSTALL_RETRY };
25
27// Install the package specified by root_path. If INSTALL_SUCCESS is 26// Install the package specified by root_path. If INSTALL_SUCCESS is
28// returned and *wipe_cache is true on exit, caller should wipe the 27// returned and *wipe_cache is true on exit, caller should wipe the
29// cache partition. 28// cache partition.