diff options
| author | Jiayu Hu <hujiayu@google.com> | 2023-12-01 16:03:13 -0800 |
|---|---|---|
| committer | Jiayu Hu <hujiayu@google.com> | 2023-12-01 16:32:17 -0800 |
| commit | 680dbbd97ed411c19591e4c35616f0b418a56dc9 (patch) | |
| tree | 361a0a9f99e3e53c51b9ea156b66987f2681b7bb | |
| parent | cb6ac3ede1d2ad050895b588417ea353c75953fe (diff) | |
| download | icing-680dbbd97ed411c19591e4c35616f0b418a56dc9.tar.gz | |
Update Icing from upstream.
Descriptions:
========================================================================
Fix the build error in aosp/2856025
========================================================================
Change-Id: I8a1030d95d3221cc8484b98e0401b61b4e62a289
| -rw-r--r-- | icing/portable/platform.h | 3 | ||||
| -rw-r--r-- | synced_AOSP_CL_number.txt | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/icing/portable/platform.h b/icing/portable/platform.h index 1dff94c..6d8c668 100644 --- a/icing/portable/platform.h +++ b/icing/portable/platform.h @@ -15,6 +15,9 @@ #ifndef ICING_PORTABLE_PLATFORM_H_ #define ICING_PORTABLE_PLATFORM_H_ +#include "unicode/uconfig.h" // IWYU pragma: keep +// clang-format: do not reorder the above include. + #include "unicode/uvernum.h" namespace icing { diff --git a/synced_AOSP_CL_number.txt b/synced_AOSP_CL_number.txt index 0851683..d79ff41 100644 --- a/synced_AOSP_CL_number.txt +++ b/synced_AOSP_CL_number.txt @@ -1 +1 @@ -set(synced_AOSP_CL_number=586780519) +set(synced_AOSP_CL_number=587157429) |