From d8a94044554a80b17a4fc20c9de4109740a455ba Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <dmitry.avdeev@jetbrains.com>
Date: Thu, 20 Jun 2019 15:06:17 +0300
Subject: [PATCH] converted flags module into library

GitOrigin-RevId: 8ad3656d41d5c42830ae8cbde78c7fec945ad3d4
---
 .idea/modules.xml                                          | 1 -
 build/dependencies/androidToolsLibs/flags/build.gradle     | 7 +++++--
 .../intellij/build/CommunityLibraryLicenses.groovy         | 2 ++
 .../intellij/build/CommunityRepositoryModules.groovy       | 1 -
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0e297d50603..b2895c1c9ddd 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -346,7 +346,6 @@
   </component>
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/android/tools-base/flags/android.sdktools.flags.iml" filepath="$PROJECT_DIR$/android/tools-base/flags/android.sdktools.flags.iml" />
       <module fileurl="file://$PROJECT_DIR$/android/tools-base/android.sdktools.layoutlib-resources.iml" filepath="$PROJECT_DIR$/android/tools-base/android.sdktools.layoutlib-resources.iml" />
       <module fileurl="file://$PROJECT_DIR$/android/tools-base/sdklib/android.sdktools.sdklib.iml" filepath="$PROJECT_DIR$/android/tools-base/sdklib/android.sdktools.sdklib.iml" />
       <module fileurl="file://$PROJECT_DIR$/android/android-adb/intellij.android.adb.iml" filepath="$PROJECT_DIR$/android/android-adb/intellij.android.adb.iml" />
diff --git a/build/dependencies/androidToolsLibs/flags/build.gradle b/build/dependencies/androidToolsLibs/flags/build.gradle
index 4d01013ea622..32c9a48e4fe6 100644
--- a/build/dependencies/androidToolsLibs/flags/build.gradle
+++ b/build/dependencies/androidToolsLibs/flags/build.gradle
@@ -1,6 +1,9 @@
 // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+sourceSets {
+  main.java.srcDirs += "$tools/flags/src/test/java"
+}
 dependencies {
   compile 'com.android.tools:annotations:26.3.0'
-//  compile 'junit:junit:4.12'
-//  compile 'com.google.truth:truth:0.34'
+  compile 'junit:junit:4.12'
+  compile 'com.google.truth:truth:0.34'
 }
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
index 6311c531e00a..737184367238 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
@@ -58,6 +58,8 @@ class CommunityLibraryLicenses {
     new LibraryLicense(name: "Android draw9patch library", libraryName: "com.android.tools:draw9patch", license: "Apache 2.0",
                        url: "http://source.android.com/"),
     new LibraryLicense(name: "Android dvlib library", libraryName: "com.android.tools:dvlib", license: "Apache 2.0", url: "http://source.android.com/"),
+    new LibraryLicense(name: "Android Flags", libraryName: "org.jetbrains.intellij.deps.android.tools:flags", license: "Apache 2.0",
+                       url: "http://source.android.com/"),
     new LibraryLicense(name: "Android Gradle model", attachedTo: "intellij.android.core", version: "0.4-SNAPSHOT", license: "Apache 2.0",
                        url: "https://android.googlesource.com/platform/tools/build/+/master/gradle-model/"),
     new LibraryLicense(name: "Android IDE Extensions", libraryName: "android-extensions-ide.jar", license: "Apache 2.0",
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
index 63feb2ddd16e..26f69655b35e 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
@@ -263,7 +263,6 @@ class CommunityRepositoryModules {
       withModule("intellij.android.artwork")
       withModule("intellij.android.observable", "android.jar")
       withModule("intellij.android.observable.ui", "android.jar")
-      withModule("android.sdktools.flags", "android.jar")
       withModule("intellij.android.designer", "android.jar")
       withModule("intellij.android.sdkUpdates", "android.jar")
       withModule("intellij.android.wizard", "android.jar")