Merge tag 'android-14.0.0_r17' into staging/lineage-21.0_merge-android-14.0.0_r17
Android 14.0.0 Release 17 (UQ1A.231205.015)
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZXDPJgAKCRDorT+BmrEO
# eNrvAJ0VnrC+yN6JEYjAea2XRoE1E/JMfQCdEc7gGBotfm61VCfWyRy+IpPhIi0=
# =3+5v
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Dec 6 21:44:38 2023 EET
# gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2181 signatures in the past
# 2 years. Encrypted 4 messages in the past 23 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78
# By Elliott Hughes
# Via Automerger Merge Worker (2) and others
* tag 'android-14.0.0_r17':
Build sgdisk with _FILE_OFFSET_BITS=64.
Change-Id: I75e562f769c874973df7e282714ee036f684a710
diff --git a/Android.bp b/Android.bp
index 7621ce1..99a446a 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 {