Android ICU4.2.1 upgrade.

    Added "include <config.h>" into WebKit/android/icu/unicode/ucnv.cpp to avoid
    compiler error.

    Bug: 1823720
    Reviewed-by: benm@google.com,enh@google.com
    CC:
    Signed-off-by:

diff --git a/WebKit/android/icu/unicode/ucnv.cpp b/WebKit/android/icu/unicode/ucnv.cpp
index 6407a09..1963dd2 100644 (file)
--- a/WebKit/android/icu/unicode/ucnv.cpp
+++ b/WebKit/android/icu/unicode/ucnv.cpp
@@ -23,6 +23,15 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+// BEGIN android-added
+// Add config.h to avoid compiler error in uobject.h
+// ucnv.h includes uobject.h indirectly and uobjetcs.h defines new/delete.
+// new/delete are also defined in WebCorePrefix.h which auto included in Android make.
+//
+// config.h has to be on top of the include list.
+#include "config.h"
+// END android-added
+
 #include "EmojiFont.h"
 #include <icu4c/common/unicode/ucnv.h>