diff options
author | Kelvin Zhang <zhangkelvin@google.com> | 2020-12-04 13:28:47 -0500 |
---|---|---|
committer | Kelvin Zhang <zhangkelvin@google.com> | 2020-12-05 14:39:00 -0500 |
commit | 4aeaa124fafcf18b8664b2baf815e17c27c834a8 (patch) | |
tree | a545ff82c2e3da84d9fdcd0f0086809cac8a2b6a /common/dynamic_partition_control_interface.h | |
parent | 07676f5c38f146c5242c0a30edba57224b540e8e (diff) | |
parent | 2379503a049c1584cdfcb339e89d496a794c2680 (diff) |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Test: treehugger
Change-Id: I4984f03fa95a753fb17779451eb458f177432d4f
Diffstat (limited to 'common/dynamic_partition_control_interface.h')
-rw-r--r-- | common/dynamic_partition_control_interface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/dynamic_partition_control_interface.h b/common/dynamic_partition_control_interface.h index 855d6e82..4f46f740 100644 --- a/common/dynamic_partition_control_interface.h +++ b/common/dynamic_partition_control_interface.h @@ -26,6 +26,7 @@ #include "update_engine/common/action.h" #include "update_engine/common/cleanup_previous_update_action_delegate.h" #include "update_engine/common/error_code.h" +#include "update_engine/common/prefs_interface.h" #include "update_engine/payload_consumer/file_descriptor.h" #include "update_engine/update_metadata.pb.h" @@ -54,7 +55,6 @@ struct FeatureFlag { }; class BootControlInterface; -class PrefsInterface; class DynamicPartitionControlInterface { public: |