Android Patch: Fix the docs in icu4c

This change should be upstreamed in the future.

- Fix the opening docs block /**
- Remove the "String length" group because it groups a single function
only.

Bug: 168242257
Test: Verified the output from development/tools/ndk/build_ndk_docs.py
Change-Id: I7df740e127e5a41aa2ecf92b834941e3f6487681

8 files changed, 4 insertions, 28 deletions

diff --git a/icu4c/source/common/unicode/platform.h b/icu4c/source/common/unicode/platform.h
index 2bb2f8b31..cb3a833fe 100644
--- a/icu4c/source/common/unicode/platform.h
+++ b/icu4c/source/common/unicode/platform.h
@@ -880,6 +880,6 @@ namespace std {
 #else
 #    define U_CALLCONV_FPTR
 #endif
-/* @} */
+/** @} */
 
 #endif  // _PLATFORM_H
diff --git a/icu4c/source/common/unicode/ustring.h b/icu4c/source/common/unicode/ustring.h
index 10ea45ead..52356b23e 100644
--- a/icu4c/source/common/unicode/ustring.h
+++ b/icu4c/source/common/unicode/ustring.h
@@ -78,11 +78,6 @@
  */
 
 /**
- * \defgroup ustring_ustrlen String Length
- * \ingroup ustring_strlen
- */
-/*@{*/
-/**
  * Determine the length of an array of UChar.
  *
  * @param s The array of UChars, NULL (U+0000) terminated.
@@ -91,7 +86,6 @@
  */
 U_CAPI int32_t U_EXPORT2
 u_strlen(const UChar *s);
-/*@}*/
 
 /**
  * Count Unicode code points in the length UChar code units of the string.
diff --git a/libandroidicu/include/unicode/platform.h b/libandroidicu/include/unicode/platform.h
index 2bb2f8b31..cb3a833fe 100644
--- a/libandroidicu/include/unicode/platform.h
+++ b/libandroidicu/include/unicode/platform.h
@@ -880,6 +880,6 @@ namespace std {
 #else
 #    define U_CALLCONV_FPTR
 #endif
-/* @} */
+/** @} */
 
 #endif  // _PLATFORM_H
diff --git a/libandroidicu/include/unicode/ustring.h b/libandroidicu/include/unicode/ustring.h
index 10ea45ead..52356b23e 100644
--- a/libandroidicu/include/unicode/ustring.h
+++ b/libandroidicu/include/unicode/ustring.h
@@ -78,11 +78,6 @@
  */
 
 /**
- * \defgroup ustring_ustrlen String Length
- * \ingroup ustring_strlen
- */
-/*@{*/
-/**
  * Determine the length of an array of UChar.
  *
  * @param s The array of UChars, NULL (U+0000) terminated.
@@ -91,7 +86,6 @@
  */
 U_CAPI int32_t U_EXPORT2
 u_strlen(const UChar *s);
-/*@}*/
 
 /**
  * Count Unicode code points in the length UChar code units of the string.
diff --git a/libicu/cts_headers/unicode/platform.h b/libicu/cts_headers/unicode/platform.h
index 2bb2f8b31..cb3a833fe 100644
--- a/libicu/cts_headers/unicode/platform.h
+++ b/libicu/cts_headers/unicode/platform.h
@@ -880,6 +880,6 @@ namespace std {
 #else
 #    define U_CALLCONV_FPTR
 #endif
-/* @} */
+/** @} */
 
 #endif  // _PLATFORM_H
diff --git a/libicu/cts_headers/unicode/ustring.h b/libicu/cts_headers/unicode/ustring.h
index 10ea45ead..52356b23e 100644
--- a/libicu/cts_headers/unicode/ustring.h
+++ b/libicu/cts_headers/unicode/ustring.h
@@ -78,11 +78,6 @@
  */
 
 /**
- * \defgroup ustring_ustrlen String Length
- * \ingroup ustring_strlen
- */
-/*@{*/
-/**
  * Determine the length of an array of UChar.
  *
  * @param s The array of UChars, NULL (U+0000) terminated.
@@ -91,7 +86,6 @@
  */
 U_CAPI int32_t U_EXPORT2
 u_strlen(const UChar *s);
-/*@}*/
 
 /**
  * Count Unicode code points in the length UChar code units of the string.
diff --git a/libicu/ndk_headers/unicode/platform.h b/libicu/ndk_headers/unicode/platform.h
index 67793d2a0..47bb1e6a2 100644
--- a/libicu/ndk_headers/unicode/platform.h
+++ b/libicu/ndk_headers/unicode/platform.h
@@ -880,6 +880,6 @@ namespace std {
 #else
 #    define U_CALLCONV_FPTR
 #endif
-/* @} */
+/** @} */
 
 #endif  // _PLATFORM_H
diff --git a/libicu/ndk_headers/unicode/ustring.h b/libicu/ndk_headers/unicode/ustring.h
index e5d835b25..3c2c4e363 100644
--- a/libicu/ndk_headers/unicode/ustring.h
+++ b/libicu/ndk_headers/unicode/ustring.h
@@ -79,11 +79,6 @@
  */
 
 /**
- * \defgroup ustring_ustrlen String Length
- * \ingroup ustring_strlen
- */
-/*@{*/
-/**
  * Determine the length of an array of UChar.
  *
  * @param s The array of UChars, NULL (U+0000) terminated.
@@ -94,7 +89,6 @@ U_CAPI int32_t U_EXPORT2
 u_strlen(const UChar *s) __INTRODUCED_IN(31);
 
 
-/*@}*/
 
 /**
  * Count Unicode code points in the length UChar code units of the string.