diff options
| author | Amin Hassani <ahassani@chromium.org> | 2019-01-07 14:01:17 -0800 |
|---|---|---|
| committer | Amin Hassani <ahassani@chromium.org> | 2019-01-08 15:29:09 -0800 |
| commit | 2e4eda58d2dd747680cfb519b31072027190370a (patch) | |
| tree | e7a752aca5865cac62398f922f5ed72153a7fc7a /common/action_processor.h | |
| parent | 58e01d6e42664015e22518ff5015b2348d7e7b03 (diff) | |
| parent | 3ce4e526eef90cec0d659f33e567d1fffa4373a0 (diff) | |
update_engine: Merge remote-tracking branch 'cros/upstream' into cros/master
Since libchrome in AOSP is ahead of CrOS I had to guard against BASE_VER in a
few places to satisfy older libchromes.
file_fetcher.cc is now needed in delta_generator.
A few unittests need to be run as root.
BUG=chromium:916593
TEST=unittest
TEST=cros_generate_update_payload
TEST=cros flash
CQ-DEPEND=CL:1399261
Change-Id: If3497549e88e559f8ecc38f414259b9c774f4a44
Diffstat (limited to 'common/action_processor.h')
| -rw-r--r-- | common/action_processor.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/common/action_processor.h b/common/action_processor.h index f651b8e3..1a67c993 100644 --- a/common/action_processor.h +++ b/common/action_processor.h @@ -26,6 +26,8 @@ #include "update_engine/common/error_code.h" +#include <gtest/gtest_prod.h> + // The structure of these classes (Action, ActionPipe, ActionProcessor, etc.) // is based on the KSAction* classes from the Google Update Engine code at // http://code.google.com/p/update-engine/ . The author of this file sends |