diff options
| author | A. Cody Schuffelen <schuffelen@google.com> | 2023-08-09 16:31:59 -0700 |
|---|---|---|
| committer | Cody Schuffelen <schuffelen@google.com> | 2023-08-10 00:19:38 +0000 |
| commit | 86bbbaf0703b2976d29c25e8ee50741bd587a9b8 (patch) | |
| tree | 666db744191b41115eb7955b7b91ac037b345ea9 /Android.bp | |
| parent | 452105558697de3cba872d826278bae00555deb4 (diff) | |
| download | grpc-grpc-86bbbaf0703b2976d29c25e8ee50741bd587a9b8.tar.gz | |
Undefine `ANDROID` for the gRPC darwin / Mac OS build
The `defined(ANDROID)` check in gRPC's platform detection comes before
the `defined(APPLE)` check, so removing `ANDROID` falls through to the
correct part of the platform detection logic.
This was causing some build errors around trying to include
linux-specific features like vsock.
Platform detection logic is in include/grpc/impl/codegen/port_platform.h
Test: m libgrpc
Bug: 295239604
Change-Id: I83bfef0fe3248559ea5dde59c204f6cd47e8be85
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index 2eb0c01246..7d76097aef 100644 --- a/Android.bp +++ b/Android.bp @@ -57,6 +57,11 @@ cc_defaults { stl: "libc++", min_sdk_version: "30", visibility: ["//external/grpc-grpc:__subpackages__"], + target: { + darwin: { + cflags: ["-UANDROID"], + }, + }, } cc_defaults { |