summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPranav Vashi <neobuddy89@gmail.com>2021-05-22 21:14:45 +0530
committerSemavi Ulusoy <doc.divxm@gmail.com>2021-06-30 13:15:03 +0300
commit4224ed1d504abf3e078381e9e65d3bc937cb1f5d (patch)
treef05ebcd2727845b0564b81b3078c013b0b7be7bc
parente5144db2294aa08b29e828619965e36ef65f04aa (diff)
Revert "update_engine: Run backuptool only in debuggable builds"
This reverts commit 5374eaa2b1824e0c7e6f2628c34baa438626127f. Change-Id: I36dd04f86612682344b08ff8674d3f1c8442661d
-rw-r--r--Android.bp7
-rw-r--r--payload_consumer/postinstall_runner_action.cc2
2 files changed, 0 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index 89bbd0f3..a15335be 100644
--- a/Android.bp
+++ b/Android.bp
@@ -135,13 +135,6 @@ cc_defaults {
"libprocessgroup",
"libselinux",
],
- product_variables: {
- debuggable: {
- cflags: [
- "-DRUN_BACKUPTOOL",
- ],
- },
- },
}
cc_library_static {
diff --git a/payload_consumer/postinstall_runner_action.cc b/payload_consumer/postinstall_runner_action.cc
index 3f905fd4..f5756ab4 100644
--- a/payload_consumer/postinstall_runner_action.cc
+++ b/payload_consumer/postinstall_runner_action.cc
@@ -152,7 +152,6 @@ void PostinstallRunnerAction::PerformPartitionPostinstall() {
}
#ifdef __ANDROID__
-#ifdef RUN_BACKUPTOOL
// Check the currently installed /system partition to see if it's ever
// been mounted R/W. If it has, we'll run backuptool scripts for it
// since we can safely assume something on the partition has been
@@ -217,7 +216,6 @@ void PostinstallRunnerAction::PerformPartitionPostinstall() {
}
utils::UnmountFilesystem(fs_mount_dir_);
-#endif // RUN_BACKUPTOOL
// In Chromium OS, the postinstall step is allowed to write to the block
// device on the target image, so we don't mark it as read-only and should