Build sgdisk with _FILE_OFFSET_BITS=64. am: f123bad00c am: 8f28f1ba13 am: bdd2ff508d am: 4fa3acb792

Original change: https://android-review.googlesource.com/c/platform/external/gptfdisk/+/2693070

Change-Id: Id55ea6f7b9bc1c7be90640753007fa7365af18cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/Android.bp b/Android.bp
index ec1c354..c1a916a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,15 +37,14 @@ cc_defaults {
         "-Wno-pragma-pack",
         "-Werror",
         "-fPIC",
+        "-D_FILE_OFFSET_BITS=64",
     ],
-    target: {
-        darwin: {
-            cflags: [
-                "-D_FILE_OFFSET_BITS=64",
-                "-Doff64_t=off_t",
-            ],
-        },
-    },
+    // This project requires _FILE_OFFSET_BITS=64, which isn't globally
+    // true for 32-bit Android builds. It's safe here because the libraries
+    // built by this build file aren't exported. If that changes, you'll
+    // need to come up with a plan (probably either upstreaming better 32-bit
+    // support, or waiting until we no longer support 32-bit either).
+    visibility: [":__subpackages__"],
 }
 
 cc_binary {