r357700 - Updating Chromium's Java import order

[Nico Weber via cfe-commits]

Author: nico
Date: Thu Apr  4 07:19:45 2019
New Revision: 357700

URL: http://llvm.org/viewvc/llvm-project?rev=357700&view=rev
Log:
Updating Chromium's Java import order

Adding in androidx as another import group.

Differential Revision: https://reviews.llvm.org/D60203

Patch from Sam Maier <smaier at chromium.org>!

Modified:
    cfe/trunk/lib/Format/Format.cpp

Modified: cfe/trunk/lib/Format/Format.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=357700&r1=357699&r2=357700&view=diff
==============================================================================
--- cfe/trunk/lib/Format/Format.cpp (original)
+++ cfe/trunk/lib/Format/Format.cpp Thu Apr  4 07:19:45 2019
@@ -898,9 +898,16 @@ FormatStyle getChromiumStyle(FormatStyle
     // See styleguide for import groups:
     // https://chromium.googlesource.com/chromium/src/+/master/styleguide/java/java.md#Import-Order
     ChromiumStyle.JavaImportGroups = {
-        "android",      "com",  "dalvik",
-        "junit",        "org",  "com.google.android.apps.chrome",
-        "org.chromium", "java", "javax",
+        "android",
+        "androidx",
+        "com",
+        "dalvik",
+        "junit",
+        "org",
+        "com.google.android.apps.chrome",
+        "org.chromium",
+        "java",
+        "javax",
     };
     ChromiumStyle.SortIncludes = true;
   } else if (Language == FormatStyle::LK_JavaScript) {