From 083e0bea7444b98d43820beeb6eeb090d3b4a05f Mon Sep 17 00:00:00 2001 From: Sergio Andres Rodriguez Orama Date: Tue, 19 May 2026 15:41:54 -0400 Subject: [PATCH] Revert "Set up shared library targets." This reverts commit dbb670ee6a3147f519f8f290910945e183954662. Bug: b/514738327 --- base/cvd/BUILD.bazel | 45 +------------------ base/cvd/build_variables.bzl | 2 - .../cvd/cuttlefish/common/libs/fs/BUILD.bazel | 19 -------- .../cuttlefish/common/libs/utils/BUILD.bazel | 17 ------- base/cvd/cuttlefish/package/BUILD.bazel | 6 --- base/cvd/cuttlefish/result/BUILD.bazel | 17 ------- base/cvd/libbase/BUILD.bazel | 16 +------ 7 files changed, 2 insertions(+), 120 deletions(-) diff --git a/base/cvd/BUILD.bazel b/base/cvd/BUILD.bazel index d6cd3253301..8de4984ebc4 100644 --- a/base/cvd/BUILD.bazel +++ b/base/cvd/BUILD.bazel @@ -1,5 +1,5 @@ load("@rules_cc//cc:cc_import.bzl", "cc_import") -load("@rules_cc//cc:cc_shared_library.bzl", "cc_shared_library") +load("@rules_cc//cc:cc_library.bzl", "cc_library") package_group( name = "android_cuttlefish", @@ -78,46 +78,3 @@ cc_import( shared_library = ":gfxstream_backend", visibility = ["//visibility:public"], ) - -cc_shared_library( - name = "absl_shared", - exports_filter = [ - "@abseil-cpp//:__subpackages__", - ], - shared_lib_name = "libcuttlefish_absl.so", - deps = [ - "@abseil-cpp//absl/base", - "@abseil-cpp//absl/cleanup", - "@abseil-cpp//absl/container:flat_hash_map", - "@abseil-cpp//absl/container:flat_hash_set", - "@abseil-cpp//absl/debugging:stacktrace", - "@abseil-cpp//absl/debugging:symbolize", - "@abseil-cpp//absl/flags:flag", - "@abseil-cpp//absl/flags:parse", - "@abseil-cpp//absl/hash", - "@abseil-cpp//absl/log", - "@abseil-cpp//absl/log:check", - "@abseil-cpp//absl/log:globals", - "@abseil-cpp//absl/log:initialize", - "@abseil-cpp//absl/numeric:int128", - "@abseil-cpp//absl/status", - "@abseil-cpp//absl/status:statusor", - "@abseil-cpp//absl/strings", - "@abseil-cpp//absl/strings:cord", - "@abseil-cpp//absl/strings:internal", - "@abseil-cpp//absl/strings:str_format", - "@abseil-cpp//absl/synchronization", - "@abseil-cpp//absl/time", - ], -) - -cc_shared_library( - name = "fmt_shared", - exports_filter = [ - "@fmt//:__subpackages__", - ], - shared_lib_name = "libcuttlefish_fmt.so", - deps = [ - "@fmt", - ], -) diff --git a/base/cvd/build_variables.bzl b/base/cvd/build_variables.bzl index c1cf6c12e40..55b7bdbeeeb 100644 --- a/base/cvd/build_variables.bzl +++ b/base/cvd/build_variables.bzl @@ -6,6 +6,4 @@ COPTS = [ ] LINKOPTS = [ - "-Wl,-rpath,$ORIGIN/../lib64", - "-Wl,-rpath,$ORIGIN/../lib", ] diff --git a/base/cvd/cuttlefish/common/libs/fs/BUILD.bazel b/base/cvd/cuttlefish/common/libs/fs/BUILD.bazel index 3d02729594c..e5a725782fe 100644 --- a/base/cvd/cuttlefish/common/libs/fs/BUILD.bazel +++ b/base/cvd/cuttlefish/common/libs/fs/BUILD.bazel @@ -1,4 +1,3 @@ -load("@rules_cc//cc:cc_shared_library.bzl", "cc_shared_library") load("//cuttlefish/bazel:rules.bzl", "cf_cc_library", "cf_cc_test") package( @@ -18,24 +17,6 @@ cf_cc_library( ], ) -cc_shared_library( - name = "fs_shared", - dynamic_deps = [ - "//:absl_shared", - "//cuttlefish/result:result_shared", - "//libbase:libbase_shared", - ], - shared_lib_name = "libcuttlefish_fs.so", - user_link_flags = [ - "-Wl,-rpath,$ORIGIN/", - ], - deps = [ - ":fs", - "//cuttlefish/common/libs/utils:environment", - "//cuttlefish/posix:strerror", - ], -) - cf_cc_library( name = "fs", srcs = [ diff --git a/base/cvd/cuttlefish/common/libs/utils/BUILD.bazel b/base/cvd/cuttlefish/common/libs/utils/BUILD.bazel index 24db236336b..f24b2ad8c96 100644 --- a/base/cvd/cuttlefish/common/libs/utils/BUILD.bazel +++ b/base/cvd/cuttlefish/common/libs/utils/BUILD.bazel @@ -1,4 +1,3 @@ -load("@rules_cc//cc:cc_shared_library.bzl", "cc_shared_library") load("//cuttlefish/bazel:rules.bzl", "cf_cc_library", "cf_cc_test") package( @@ -106,22 +105,6 @@ cf_cc_test( ], ) -cc_shared_library( - name = "files_shared", - dynamic_deps = ["//cuttlefish/common/libs/fs:fs_shared"], - shared_lib_name = "libcuttlefish_files.so", - user_link_flags = [ - "-Wl,-rpath,$ORIGIN/", - ], - deps = [ - ":files", - ":users", - "//cuttlefish/common/libs/utils:in_sandbox", - "//cuttlefish/posix:rename", - "//cuttlefish/posix:symlink", - ], -) - cf_cc_library( name = "files", srcs = ["files.cpp"], diff --git a/base/cvd/cuttlefish/package/BUILD.bazel b/base/cvd/cuttlefish/package/BUILD.bazel index ba346e85b12..36bbfdb81fa 100644 --- a/base/cvd/cuttlefish/package/BUILD.bazel +++ b/base/cvd/cuttlefish/package/BUILD.bazel @@ -132,12 +132,6 @@ package_files( "cuttlefish-common/usr/share/webrtc/assets/js/gamepad.js": "//cuttlefish/host/frontend/webrtc/html_client:js/gamepad.js", "cuttlefish-common/usr/share/webrtc/assets/js/rootcanal.js": "//cuttlefish/host/frontend/webrtc/html_client:js/rootcanal.js", "cuttlefish-common/usr/share/webrtc/assets/js/touch.js": "//cuttlefish/host/frontend/webrtc/html_client:js/touch.js", - "cuttlefish-common/lib64/libcuttlefish_result.so": "//cuttlefish/result:result_shared", - "cuttlefish-common/lib64/libcuttlefish_files.so": "//cuttlefish/common/libs/utils:files_shared", - "cuttlefish-common/lib64/libcuttlefish_fs.so": "//cuttlefish/common/libs/fs:fs_shared", - "cuttlefish-common/lib64/libcuttlefish_libbase.so": "//libbase:libbase_shared", - "cuttlefish-common/lib64/libcuttlefish_absl.so": "//:absl_shared", - "cuttlefish-common/lib64/libcuttlefish_fmt.so": "//:fmt_shared", }, visibility = ["//:android_cuttlefish"], ) diff --git a/base/cvd/cuttlefish/result/BUILD.bazel b/base/cvd/cuttlefish/result/BUILD.bazel index 4be2b13486b..061d9f8efec 100644 --- a/base/cvd/cuttlefish/result/BUILD.bazel +++ b/base/cvd/cuttlefish/result/BUILD.bazel @@ -1,4 +1,3 @@ -load("@rules_cc//cc:cc_shared_library.bzl", "cc_shared_library") load("//cuttlefish/bazel:rules.bzl", "cf_cc_library", "cf_cc_test") package( @@ -28,22 +27,6 @@ cf_cc_library( ], ) -cc_shared_library( - name = "result_shared", - dynamic_deps = [ - "//libbase:libbase_shared", - "//:absl_shared", - ], - shared_lib_name = "libcuttlefish_result.so", - user_link_flags = [ - "-Wl,-rpath,$ORIGIN/", - ], - deps = [ - ":error_type", - ":result", - ], -) - cf_cc_library( name = "result", hdrs = ["result.h"], diff --git a/base/cvd/libbase/BUILD.bazel b/base/cvd/libbase/BUILD.bazel index e9480b9ded6..bde95462b3c 100644 --- a/base/cvd/libbase/BUILD.bazel +++ b/base/cvd/libbase/BUILD.bazel @@ -1,5 +1,5 @@ load("@rules_cc//cc:cc_library.bzl", "cc_library") -load("@rules_cc//cc:cc_shared_library.bzl", "cc_shared_library") + load("//:build_variables.bzl", "COPTS") package( @@ -26,20 +26,6 @@ cc_library( visibility = ["//visibility:private"], ) -cc_shared_library( - name = "libbase_shared", - dynamic_deps = [ - "//:fmt_shared", - ], - shared_lib_name = "libcuttlefish_libbase.so", - user_link_flags = [ - "-Wl,-rpath,$ORIGIN/", - ], - deps = [ - ":libbase", - ], -) - cc_library( name = "libbase", srcs = [