| commit | 15f9c391ccaa11214f43861c96b0ae9550be445b | [log] [tgz] |
|---|---|---|
| author | Yi Kong <[email protected]> | Fri Sep 10 05:56:13 2021 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Fri Sep 10 05:56:13 2021 +0000 |
| tree | 25e83a1404d86b48f8c26949ef44c01c9133102c | |
| parent | 0768c5bb89c9ca82af0fa888d59c4db8278e2ece [diff] | |
| parent | 787ca3185d15d8dbd2f68584d7a23be0b5bac61e [diff] |
Merge "Do not use pragma diagnostics as a workaround" am: 010d40bb2f am: 63d977a809 am: 3afade4d2e am: e8017cf8b1 am: 787ca3185d Original change: https://android-review.googlesource.com/c/platform/external/harfbuzz_ng/+/1815036 Change-Id: I26b5eb32fd091cc409e469f47bdb2ac7c4e66a7d
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",