Revert "libsnapshot: Add Parser v3 + stub"
Revert submission 2781730
Reason for revert: It breaks build
Reverted changes: /q/submissionid:2781730
Bug: 308868619
Change-Id: I53b6b619635f150455cdba00237d130cae5df347
diff --git a/fs_mgr/libsnapshot/Android.bp b/fs_mgr/libsnapshot/Android.bp
index ac58ba0..6fad662 100644
--- a/fs_mgr/libsnapshot/Android.bp
+++ b/fs_mgr/libsnapshot/Android.bp
@@ -198,7 +198,6 @@
"libsnapshot_cow/cow_format.cpp",
"libsnapshot_cow/cow_reader.cpp",
"libsnapshot_cow/parser_v2.cpp",
- "libsnapshot_cow/parser_v3.cpp",
"libsnapshot_cow/snapshot_reader.cpp",
"libsnapshot_cow/writer_base.cpp",
"libsnapshot_cow/writer_v2.cpp",
diff --git a/fs_mgr/libsnapshot/libsnapshot_cow/parser_v2.h b/fs_mgr/libsnapshot/libsnapshot_cow/parser_v2.h
index 318a3ac..a70c780 100644
--- a/fs_mgr/libsnapshot/libsnapshot_cow/parser_v2.h
+++ b/fs_mgr/libsnapshot/libsnapshot_cow/parser_v2.h
@@ -21,7 +21,7 @@
#include <android-base/unique_fd.h>
#include <libsnapshot/cow_format.h>
-#include <libsnapshot_cow/parser_base.h>
+#include "parser_base.h"
namespace android {
namespace snapshot {
diff --git a/fs_mgr/libsnapshot/libsnapshot_cow/parser_v3.cpp b/fs_mgr/libsnapshot/libsnapshot_cow/parser_v3.cpp
deleted file mode 100644
index 9880670..0000000
--- a/fs_mgr/libsnapshot/libsnapshot_cow/parser_v3.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (C) 2023 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-#include "parser_v3.h"
-
-#include <android-base/file.h>
-#include <android-base/logging.h>
-#include "libsnapshot/cow_format.h"
-
-namespace android {
-namespace snapshot {
-
-using android::base::borrowed_fd;
-
-bool CowParserV3::Parse(borrowed_fd fd, const CowHeaderV3& header, std::optional<uint64_t> label) {
- LOG(ERROR) << "this function should never be called";
- if (fd.get() || sizeof(header) > 0 || label) return false;
- return false;
-}
-
-bool CowParserV3::ParseOps(android::base::borrowed_fd fd, std::optional<uint64_t> label) {
- LOG(ERROR) << "this function should never be called";
- if (fd.get() || label) return false;
- return false;
-}
-
-bool CowParserV3::Translate(TranslatedCowOps* out) {
- out->ops = ops_;
- out->header = header_;
- return true;
-}
-
-} // namespace snapshot
-} // namespace android
diff --git a/fs_mgr/libsnapshot/libsnapshot_cow/parser_v3.h b/fs_mgr/libsnapshot/libsnapshot_cow/parser_v3.h
deleted file mode 100644
index b766aa7..0000000
--- a/fs_mgr/libsnapshot/libsnapshot_cow/parser_v3.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (C) 2023 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// Copyright (C) 2023 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-#pragma once
-
-#include <stdint.h>
-
-#include <memory>
-#include <optional>
-#include <unordered_map>
-#include <vector>
-
-#include <android-base/unique_fd.h>
-#include <libsnapshot/cow_format.h>
-#include <libsnapshot_cow/parser_base.h>
-
-namespace android {
-namespace snapshot {
-
-class CowParserV3 final : public CowParserBase {
- public:
- bool Parse(android::base::borrowed_fd fd, const CowHeaderV3& header,
- std::optional<uint64_t> label = {}) override;
- bool Translate(TranslatedCowOps* out) override;
-
- private:
- bool ParseOps(android::base::borrowed_fd fd, std::optional<uint64_t> label);
-
- CowHeaderV3 header_ = {};
- std::shared_ptr<std::vector<CowOperationV3>> ops_;
-};
-
-} // namespace snapshot
-} // namespace android