Skip to content

Commit 5b12ce4

Browse files
committed
Enforce clang-format on more of host/libs/web
Bug: b/512215781
1 parent ba25b4f commit 5b12ce4

6 files changed

Lines changed: 11 additions & 18 deletions

File tree

base/cvd/cuttlefish/host/libs/web/BUILD.bazel

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ cf_cc_library(
2121
name = "android_build_api",
2222
srcs = ["android_build_api.cpp"],
2323
hdrs = ["android_build_api.h"],
24-
clang_format_enabled = False,
2524
deps = [
2625
"//cuttlefish/common/libs/utils:contains",
2726
"//cuttlefish/common/libs/utils:environment",
@@ -62,7 +61,6 @@ cf_cc_library(
6261
name = "android_build_string",
6362
srcs = ["android_build_string.cpp"],
6463
hdrs = ["android_build_string.h"],
65-
clang_format_enabled = False,
6664
deps = [
6765
"//cuttlefish/flag_parser",
6866
"//cuttlefish/result",
@@ -115,7 +113,6 @@ cf_cc_library(
115113
name = "android_build_url",
116114
srcs = ["android_build_url.cpp"],
117115
hdrs = ["android_build_url.h"],
118-
clang_format_enabled = False,
119116
deps = [
120117
"//cuttlefish/host/libs/web/http_client:url_escape",
121118
"//cuttlefish/result",

base/cvd/cuttlefish/host/libs/web/android_build_api.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
#include <variant>
3232
#include <vector>
3333

34-
#include <json/value.h>
3534
#include "absl/log/log.h"
35+
#include "android-base/file.h"
36+
#include "json/value.h"
3637

37-
#include <android-base/file.h>
3838
#include "cuttlefish/common/libs/utils/contains.h"
3939
#include "cuttlefish/common/libs/utils/files.h"
4040
#include "cuttlefish/common/libs/utils/json.h"
@@ -148,7 +148,6 @@ Result<std::string> AndroidBuildApi::DownloadFile(
148148
return DownloadTargetFile(build, target_directory, artifact_name);
149149
}
150150

151-
152151
Result<SeekableZipSource> AndroidBuildApi::FileReader(
153152
const Build& build, const std::string& artifact_name) {
154153
Result<SeekableZipSource> res =
@@ -350,14 +349,14 @@ Result<std::string> AndroidBuildApi::GetArtifactDownloadUrl(
350349
const DeviceBuild& build, const std::string& artifact) {
351350
const std::string download_url_endpoint =
352351
android_build_url_.GetArtifactDownloadUrl(build.id, build.target,
353-
artifact);
352+
artifact);
354353
auto response = CF_EXPECT(
355354
HttpGetToJson(http_client_, download_url_endpoint, CF_EXPECT(Headers())));
356355
const Json::Value json =
357356
CF_EXPECTF(GetResponseJson(response, /* allow redirect response */ true),
358357
"Error fetching download URL for \"{}\" from build ID \"{}\"",
359358
artifact, build.id);
360-
return CF_EXPECT(GetValue<std::string>(json, { "signedUrl" }));
359+
return CF_EXPECT(GetValue<std::string>(json, {"signedUrl"}));
361360
}
362361

363362
Result<void> AndroidBuildApi::ArtifactToFile(const DeviceBuild& build,

base/cvd/cuttlefish/host/libs/web/android_build_api.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class AndroidBuildApi : public BuildApi {
5252
const std::string& target_directory,
5353
const std::string& artifact_name) override;
5454

55-
5655
Result<SeekableZipSource> FileReader(
5756
const Build&, const std::string& artifact_name) override;
5857

base/cvd/cuttlefish/host/libs/web/android_build_string.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828

2929
#include "absl/strings/str_join.h"
3030
#include "absl/strings/str_split.h"
31-
#include <fmt/ostream.h>
32-
#include <fmt/ranges.h>
31+
#include "fmt/ostream.h"
32+
#include "fmt/ranges.h"
3333

3434
#include "cuttlefish/flag_parser/flag.h"
3535
#include "cuttlefish/result/result.h"

base/cvd/cuttlefish/host/libs/web/android_build_url.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,14 @@
2222
#include <utility>
2323
#include <vector>
2424

25-
#include <fmt/core.h>
26-
#include <fmt/format.h>
27-
#include <fmt/ostream.h>
28-
#include <fmt/ranges.h> // NOLINT(misc-include-cleaner): version difference
25+
#include "fmt/core.h"
26+
#include "fmt/format.h"
27+
#include "fmt/ostream.h"
28+
#include "fmt/ranges.h"
2929

3030
#include "cuttlefish/host/libs/web/http_client/url_escape.h"
3131

3232
namespace cuttlefish {
33-
3433
namespace {
3534

3635
class UrlBuilder {
@@ -165,7 +164,7 @@ std::string AndroidBuildUrl::GetArtifactUrl(
165164
std::string_view page_token) {
166165
UrlBuilder builder =
167166
UrlBuilder::GetArtifactBaseUrl(api_base_url_, id, target);
168-
builder.AddQueryParameter("pageSize", "100"); // maximum value allowed by API
167+
builder.AddQueryParameter("pageSize", "100"); // maximum value allowed by API
169168
if (!artifact_filenames.empty()) {
170169
builder.AddQueryParameter("nameRegexp",
171170
BuildNameRegexp(artifact_filenames));

base/cvd/cuttlefish/host/libs/web/cas/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ cf_cc_library(
5555
name = "cas_flags",
5656
srcs = ["cas_flags.cc"],
5757
hdrs = ["cas_flags.h"],
58-
clang_format_enabled = False,
5958
deps = [
6059
"//cuttlefish/common/libs/utils:files",
6160
"//cuttlefish/flag_parser",

0 commit comments

Comments
 (0)