commit 4fa3acb792e385359298a64b1ac3aadf02dc0270
author Elliott Hughes <enh@google.com> Thu Aug 03 22:00:36 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 03 22:00:36 2023 +0000
tree 7a29046e71d52115ccdac85aff38a86ebc513b0b
parent 2e9d2f462272a86c5c4fec0246d02ddedcc334e9
parent bdd2ff508dc849c52d37a203a3221f8b0d3ffb6c

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

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

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

Android.bp

diff --git a/Android.bp b/Android.bp
index ec1c354..c1a916a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,15 +37,14 @@
         "-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 {