| commit | e8017cf8b1552ff030fd669a8c1ee4031837c6de | [log] [tgz] |
|---|---|---|
| author | Yi Kong <[email protected]> | Fri Sep 10 05:18:45 2021 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Fri Sep 10 05:18:45 2021 +0000 |
| tree | 25e83a1404d86b48f8c26949ef44c01c9133102c | |
| parent | 6ab231bd47b2a1fdbc6927d8667bdee916ef137a [diff] | |
| parent | 3afade4d2ebc1c4a2f254f7ab6c1de21780df4a4 [diff] |
Merge "Do not use pragma diagnostics as a workaround" am: 010d40bb2f am: 63d977a809 am: 3afade4d2e Original change: https://android-review.googlesource.com/c/platform/external/harfbuzz_ng/+/1815036 Change-Id: Ic1cb6e68574b9bb0cd47321d3593583c422d0712
diff --git a/Android.bp b/Android.bp index fa88ca6..d69ed2b 100644 --- a/Android.bp +++ b/Android.bp
@@ -181,6 +181,7 @@ export_include_dirs: ["src"], cflags: [ + "-DHB_NO_PRAGMA_GCC_DIAGNOSTIC", "-DHAVE_INTEL_ATOMIC_PRIMITIVES", "-DHAVE_OT", "-DHAVE_ICU",