diff options
Diffstat (limited to 'payload_generator')
| -rw-r--r-- | payload_generator/full_update_generator_unittest.cc | 4 | ||||
| -rw-r--r-- | payload_generator/generate_delta_main.cc | 3 | ||||
| -rw-r--r-- | payload_generator/payload_generation_config.cc | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/payload_generator/full_update_generator_unittest.cc b/payload_generator/full_update_generator_unittest.cc index 2f391268..6c1047c8 100644 --- a/payload_generator/full_update_generator_unittest.cc +++ b/payload_generator/full_update_generator_unittest.cc @@ -21,7 +21,7 @@ #include <gtest/gtest.h> -#include "update_engine/delta_performer.h" +#include "update_engine/payload_constants.h" #include "update_engine/payload_generator/extent_utils.h" #include "update_engine/test_utils.h" @@ -35,7 +35,7 @@ class FullUpdateGeneratorTest : public ::testing::Test { protected: void SetUp() override { config_.is_delta = false; - config_.minor_version = DeltaPerformer::kFullPayloadMinorVersion; + config_.minor_version = kFullPayloadMinorVersion; config_.hard_chunk_size = 128 * 1024; config_.block_size = 4096; diff --git a/payload_generator/generate_delta_main.cc b/payload_generator/generate_delta_main.cc index e122fb92..d38c5c5d 100644 --- a/payload_generator/generate_delta_main.cc +++ b/payload_generator/generate_delta_main.cc @@ -30,6 +30,7 @@ #include <chromeos/flag_helper.h> #include "update_engine/delta_performer.h" +#include "update_engine/payload_constants.h" #include "update_engine/payload_generator/delta_diff_generator.h" #include "update_engine/payload_generator/delta_diff_utils.h" #include "update_engine/payload_generator/payload_generation_config.h" @@ -424,7 +425,7 @@ int Main(int argc, char** argv) { payload_config.minor_version = kInPlaceMinorPayloadVersion; } } else { - payload_config.minor_version = DeltaPerformer::kFullPayloadMinorVersion; + payload_config.minor_version = kFullPayloadMinorVersion; } LOG(INFO) << "Auto-detected minor_version=" << payload_config.minor_version; } else { diff --git a/payload_generator/payload_generation_config.cc b/payload_generator/payload_generation_config.cc index a2d93116..786c4e21 100644 --- a/payload_generator/payload_generation_config.cc +++ b/payload_generator/payload_generation_config.cc @@ -115,8 +115,7 @@ bool PayloadGenerationConfig::Validate() const { } else { // All the "source" image fields must be empty for full payloads. TEST_AND_RETURN_FALSE(source.ValidateIsEmpty()); - TEST_AND_RETURN_FALSE(minor_version == - DeltaPerformer::kFullPayloadMinorVersion); + TEST_AND_RETURN_FALSE(minor_version == kFullPayloadMinorVersion); } // In all cases, the target image must exists. |