From 9e0ed40dc72a3a13371eac016492745c58322d34 Mon Sep 17 00:00:00 2001
From: Hai Zhang <zhanghai@google.com>
Date: Thu, 24 Sep 2020 12:59:47 -0700
Subject: Add javaparser-symbol-solver.

Test: m javaparser-symbol-solver
Change-Id: I1a03e80e786fcda67a2847d41673c1709236ef3c
---
 Android.bp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Android.bp b/Android.bp
index 68567d967..71828ae00 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24,3 +24,19 @@ java_library_host {
         "javaparser-core/generated-sources/**/*.java",
     ],
 }
+
+java_library_host {
+    name: "javaparser-symbol-solver",
+
+    srcs: [
+        "javaparser-symbol-solver-core/src/main/java/**/*.java",
+        "javaparser-symbol-solver-logic/src/main/java/**/*.java",
+        "javaparser-symbol-solver-model/src/main/java/**/*.java",
+    ],
+
+    static_libs: [
+        "guava",
+        "javaparser",
+        "javassist",
+    ],
+}
-- 
cgit v1.2.3


From 3c9e1e2751398b0066bd6fbaa651924440938729 Mon Sep 17 00:00:00 2001
From: Lev Proleev <levp@google.com>
Date: Fri, 25 Sep 2020 10:07:22 +0000
Subject: Revert "Add javaparser-symbol-solver."

This reverts commit 9e0ed40dc72a3a13371eac016492745c58322d34.

Reason for revert: breaks build on git_master-without-vendor
b/169394973

Change-Id: I5e41a357644f4b33d010a5d65a4b489819854c74
---
 Android.bp | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/Android.bp b/Android.bp
index 71828ae00..68567d967 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24,19 +24,3 @@ java_library_host {
         "javaparser-core/generated-sources/**/*.java",
     ],
 }
-
-java_library_host {
-    name: "javaparser-symbol-solver",
-
-    srcs: [
-        "javaparser-symbol-solver-core/src/main/java/**/*.java",
-        "javaparser-symbol-solver-logic/src/main/java/**/*.java",
-        "javaparser-symbol-solver-model/src/main/java/**/*.java",
-    ],
-
-    static_libs: [
-        "guava",
-        "javaparser",
-        "javassist",
-    ],
-}
-- 
cgit v1.2.3


From 67e8401f5c88f109aa95b278c3ef51dcb40e4671 Mon Sep 17 00:00:00 2001
From: Hai Zhang <zhanghai@google.com>
Date: Fri, 25 Sep 2020 10:35:15 +0000
Subject: Revert "Revert "Add javaparser-symbol-solver.""

This reverts commit 3c9e1e2751398b0066bd6fbaa651924440938729.

Reason for revert: Transient build failure due to automerger delay for ag/12691508.

Change-Id: I1b4392090a66abd0d244f6e42297b1903fec0989
---
 Android.bp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Android.bp b/Android.bp
index 68567d967..71828ae00 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24,3 +24,19 @@ java_library_host {
         "javaparser-core/generated-sources/**/*.java",
     ],
 }
+
+java_library_host {
+    name: "javaparser-symbol-solver",
+
+    srcs: [
+        "javaparser-symbol-solver-core/src/main/java/**/*.java",
+        "javaparser-symbol-solver-logic/src/main/java/**/*.java",
+        "javaparser-symbol-solver-model/src/main/java/**/*.java",
+    ],
+
+    static_libs: [
+        "guava",
+        "javaparser",
+        "javassist",
+    ],
+}
-- 
cgit v1.2.3