From 0cea45396476eb900090608af4eecf9e81dabaf3 Mon Sep 17 00:00:00 2001 From: Rahul Huilgol Date: Thu, 6 Feb 2020 22:54:57 +0000 Subject: [PATCH] Run buildifier on third part aws bazel files --- third_party/aws/BUILD.bazel | 18 +++++++++--------- third_party/aws/aws-c-common.bazel | 14 ++++++-------- third_party/aws/aws-c-event-stream.bazel | 1 - third_party/aws/aws-checksums.bazel | 11 +++++------ third_party/aws/workspace.bzl | 15 +++++++-------- 5 files changed, 27 insertions(+), 32 deletions(-) diff --git a/third_party/aws/BUILD.bazel b/third_party/aws/BUILD.bazel index 2e707fc4d0a..81e896d7fc8 100644 --- a/third_party/aws/BUILD.bazel +++ b/third_party/aws/BUILD.bazel @@ -64,6 +64,13 @@ cc_library( hdrs = [ "aws-cpp-sdk-core/include/aws/core/SDKConfig.h", ], + copts = [ + "-DENABLE_OPENSSL_ENCRYPTION", + "-DAWS_SDK_VERSION_MAJOR=1", + "-DAWS_SDK_VERSION_MINOR=7", + "-DAWS_SDK_VERSION_PATCH=266", + "-DOPENSSL_IS_BORINGSSL", + ], defines = select({ "@org_tensorflow//tensorflow:linux_aarch64": [ "PLATFORM_LINUX", @@ -92,19 +99,12 @@ cc_library( "aws-cpp-sdk-s3/include/", ], deps = [ - "@curl", - "@boringssl//:crypto", "@aws-c-common", "@aws-c-event-stream", "@aws-checksums", + "@boringssl//:crypto", + "@curl", ], - copts = [ - "-DENABLE_OPENSSL_ENCRYPTION", - "-DAWS_SDK_VERSION_MAJOR=1", - "-DAWS_SDK_VERSION_MINOR=7", - "-DAWS_SDK_VERSION_PATCH=266", - "-DOPENSSL_IS_BORINGSSL", - ], ) template_rule( diff --git a/third_party/aws/aws-c-common.bazel b/third_party/aws/aws-c-common.bazel index 6c74a8a785a..edfcbd78394 100644 --- a/third_party/aws/aws-c-common.bazel +++ b/third_party/aws/aws-c-common.bazel @@ -31,7 +31,7 @@ cc_library( }) + glob([ "source/**/*.c", "include/**/*.h", - "include/**/*.inl" + "include/**/*.inl", ]), hdrs = [ "include/aws/common/config.h", @@ -40,16 +40,15 @@ cc_library( "include/", ], deps = [ - ], copts = [ - "-std=c99", - "-D_POSIX_C_SOURCE=199309L", - "-D_GNU_SOURCE", + "-std=c99", + "-D_POSIX_C_SOURCE=199309L", + "-D_GNU_SOURCE", ], linkopts = [ - "-lrt", - "-pthread", + "-lrt", + "-pthread", ], ) @@ -64,4 +63,3 @@ template_rule( "cmakedefine AWS_HAVE_EXECINFO": "define AWS_HAVE_EXECINFO", }, ) - diff --git a/third_party/aws/aws-c-event-stream.bazel b/third_party/aws/aws-c-event-stream.bazel index 898ab6f7bab..956670c8d28 100644 --- a/third_party/aws/aws-c-event-stream.bazel +++ b/third_party/aws/aws-c-event-stream.bazel @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 exports_files(["LICENSE"]) - cc_library( name = "aws-c-event-stream", srcs = glob([ diff --git a/third_party/aws/aws-checksums.bazel b/third_party/aws/aws-checksums.bazel index 4cc42f32f74..0af7c8cd4cf 100644 --- a/third_party/aws/aws-checksums.bazel +++ b/third_party/aws/aws-checksums.bazel @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2.0 exports_files(["LICENSE"]) - cc_library( name = "aws-checksums", srcs = glob([ @@ -24,12 +23,12 @@ cc_library( "@aws-c-common", ], copts = [ - #"-std=c99", - #"-D_POSIX_C_SOURCE=199309L", - #"-D_GNU_SOURCE", + #"-std=c99", + #"-D_POSIX_C_SOURCE=199309L", + #"-D_GNU_SOURCE", ], linkopts = [ - #"-lrt", - #"-pthread", + #"-lrt", + #"-pthread", ], ) diff --git a/third_party/aws/workspace.bzl b/third_party/aws/workspace.bzl index dae7a9c9264..b54a301b3c3 100644 --- a/third_party/aws/workspace.bzl +++ b/third_party/aws/workspace.bzl @@ -16,19 +16,19 @@ def repo(): strip_prefix = "aws-sdk-cpp-1.7.266", build_file = "//third_party/aws:BUILD.bazel", ) - - third_party_http_archive( + + third_party_http_archive( name = "aws-c-common", urls = [ "http://mirror.tensorflow.org/github.com/awslabs/aws-c-common/archive/v0.4.29.tar.gz", - "https://github.com/awslabs/aws-c-common/archive/v0.4.29.tar.gz" + "https://github.com/awslabs/aws-c-common/archive/v0.4.29.tar.gz", ], sha256 = "01c2a58553a37b3aa5914d9e0bf7bf14507ff4937bc5872a678892ca20fcae1f", strip_prefix = "aws-c-common-0.4.29", build_file = "//third_party/aws:aws-c-common.bazel", ) - - third_party_http_archive( + + third_party_http_archive( name = "aws-c-event-stream", urls = [ "https://mirror.tensorflow.org/github.com/awslabs/aws-c-event-stream/archive/v0.1.4.tar.gz", @@ -38,8 +38,8 @@ def repo(): strip_prefix = "aws-c-event-stream-0.1.4", build_file = "//third_party/aws:aws-c-event-stream.bazel", ) - - third_party_http_archive( + + third_party_http_archive( name = "aws-checksums", urls = [ "https://mirror.tensorflow.org/github.com/awslabs/aws-checksums/archive/v0.1.5.tar.gz", @@ -49,4 +49,3 @@ def repo(): strip_prefix = "aws-checksums-0.1.5", build_file = "//third_party/aws:aws-checksums.bazel", ) -