Merge "Android.bp Changes" am: bc62ad4f2c am: 22e6964f0b am: e1ba5a8d35 am: 7b643c3396

Original change: https://android-review.googlesource.com/c/platform/packages/apps/QuickSearchBox/+/2206659

Change-Id: Id6765c60455a516dfb66d16bc29262017c433cfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 1 insertions, 121 deletions

diff --git a/Android.bp b/Android.bp
index 89cc425..cf84788 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,110 +21,9 @@ android_app {
     name: "QuickSearchBox",
     sdk_version: "current",
     srcs: [
-        "src/**/*.java",
         "src/**/*.kt",
         "src/**/*.logtags",
     ],
-    exclude_srcs: [
-      "src/**/quicksearchbox/google/AbstractGoogleSource.java",
-      "src/**/quicksearchbox/google/AbstractGoogleSourceResult.java",
-      "src/**/quicksearchbox/google/GoogleSearch.java",
-      "src/**/quicksearchbox/google/GoogleSource.java",
-      "src/**/quicksearchbox/google/GoogleSuggestClient.java",
-      "src/**/quicksearchbox/google/GoogleSuggestionProvider.java",
-      "src/**/quicksearchbox/google/SearchBaseUrlHelper.java",
-      "src/**/quicksearchbox/ui/BaseSuggestionView.java",
-      "src/**/quicksearchbox/ui/ClusteredSuggestionsView.java",
-      "src/**/quicksearchbox/ui/ContactBadge.java",
-      "src/**/quicksearchbox/ui/CorpusView.java",
-      "src/**/quicksearchbox/ui/DefaultSuggestionView.java",
-      "src/**/quicksearchbox/ui/DefaultSuggestionViewFactory.java",
-      "src/**/quicksearchbox/ui/DelayingSuggestionsAdapter.java",
-      "src/**/quicksearchbox/ui/QueryTextView.java",
-      "src/**/quicksearchbox/ui/SearchActivityView.java",
-      "src/**/quicksearchbox/ui/SearchActivityViewSinglePane.java",
-      "src/**/quicksearchbox/ui/SuggestionClickListener.java",
-      "src/**/quicksearchbox/ui/SuggestionsAdapter.java",
-      "src/**/quicksearchbox/ui/SuggestionsAdapterBase.java",
-      "src/**/quicksearchbox/ui/SuggestionsListAdapter.java",
-      "src/**/quicksearchbox/ui/SuggestionsListView.java",
-      "src/**/quicksearchbox/ui/SuggestionsView.java",
-      "src/**/quicksearchbox/ui/SuggestionView.java",
-      "src/**/quicksearchbox/ui/SuggestionViewFactory.java",
-      "src/**/quicksearchbox/ui/SuggestionViewInflater.java",
-      "src/**/quicksearchbox/ui/WebSearchSuggestionView.java",
-      "src/**/quicksearchbox/util/AsyncDataSetObservable.java",
-      "src/**/quicksearchbox/util/BarrierConsumer.java",
-      "src/**/quicksearchbox/util/BatchingNamedTaskExecutor.java",
-      "src/**/quicksearchbox/util/CachedLater.java",
-      "src/**/quicksearchbox/util/Consumer.java",
-      "src/**/quicksearchbox/util/Consumers.java",
-      "src/**/quicksearchbox/util/Factory.java",
-      "src/**/quicksearchbox/util/HttpHelper.java",
-      "src/**/quicksearchbox/util/JavaNetHttpHelper.java",
-      "src/**/quicksearchbox/util/LevenshteinDistance.java",
-      "src/**/quicksearchbox/util/NamedTask.java",
-      "src/**/quicksearchbox/util/NamedTaskExecutor.java",
-      "src/**/quicksearchbox/util/NoOpConsumer.java",
-      "src/**/quicksearchbox/util/Now.java",
-      "src/**/quicksearchbox/util/NowOrLater.java",
-      "src/**/quicksearchbox/util/NowOrLaterWrapper.java",
-      "src/**/quicksearchbox/util/PerNameExecutor.java",
-      "src/**/quicksearchbox/util/PriorityThreadFactory.java",
-      "src/**/quicksearchbox/util/QuietlyClosable.java",
-      "src/**/quicksearchbox/util/SingleThreadNamedTaskExecutor.java",
-      "src/**/quicksearchbox/util/SQLiteAsyncQuery.java",
-      "src/**/quicksearchbox/util/SQLiteAsyncTransaction.java",
-      "src/**/quicksearchbox/util/Util.java",
-      "src/**/quicksearchbox/AbstractInternalSource.java",
-      "src/**/quicksearchbox/AbstractSource.java",
-      "src/**/quicksearchbox/AbstractSuggestionCursorWrapper.java",
-      "src/**/quicksearchbox/AbstractSuggestionExtras.java",
-      "src/**/quicksearchbox/AbstractSuggestionWrapper.java",
-      "src/**/quicksearchbox/CachingIconLoader.java",
-      "src/**/quicksearchbox/Config.java",
-      "src/**/quicksearchbox/CursorBackedSourceResult.java",
-      "src/**/quicksearchbox/CursorBackedSuggestionCursor.java",
-      "src/**/quicksearchbox/CursorBackedSuggestionExtras.java",
-      "src/**/quicksearchbox/DialogActivity.java",
-      "src/**/quicksearchbox/EventLogLogger.java",
-      "src/**/quicksearchbox/Help.java",
-      "src/**/quicksearchbox/IconLoader.java",
-      "src/**/quicksearchbox/JsonBackedSuggestionExtras.java",
-      "src/**/quicksearchbox/LatencyTracker.java",
-      "src/**/quicksearchbox/LevenshteinSuggestionFormatter.java",
-      "src/**/quicksearchbox/ListSuggestionCursor.java",
-      "src/**/quicksearchbox/ListSuggestionCursorNoDuplicates.java",
-      "src/**/quicksearchbox/Logger.java",
-      "src/**/quicksearchbox/PackageIconLoader.java",
-      "src/**/quicksearchbox/QsbApplication.java",
-      "src/**/quicksearchbox/QsbApplicationWrapper.java",
-      "src/**/quicksearchbox/QueryTask.java",
-      "src/**/quicksearchbox/ResultFilter.java",
-      "src/**/quicksearchbox/SearchActivity.java",
-      "src/**/quicksearchbox/SearchSettings.java",
-      "src/**/quicksearchbox/SearchSettingsImpl.java",
-      "src/**/quicksearchbox/SearchWidgetProvider.java",
-      "src/**/quicksearchbox/Source.java",
-      "src/**/quicksearchbox/SourceResult.java",
-      "src/**/quicksearchbox/Suggestion.java",
-      "src/**/quicksearchbox/SuggestionCursor.java",
-      "src/**/quicksearchbox/SuggestionCursorProvider.java",
-      "src/**/quicksearchbox/SuggestionCursorBackedCursor.java",
-      "src/**/quicksearchbox/SuggestionCursorWrapper.java",
-      "src/**/quicksearchbox/SuggestionData.java",
-      "src/**/quicksearchbox/SuggestionExtras.java",
-      "src/**/quicksearchbox/SuggestionFilter.java",
-      "src/**/quicksearchbox/SuggestionFormatter.java",
-      "src/**/quicksearchbox/SuggestionNonFormatter.java",
-      "src/**/quicksearchbox/SuggestionPosition.java",
-      "src/**/quicksearchbox/Suggestions.java",
-      "src/**/quicksearchbox/SuggestionsProvider.java",
-      "src/**/quicksearchbox/SuggestionsProviderImpl.java",
-      "src/**/quicksearchbox/SuggestionUtils.java",
-      "src/**/quicksearchbox/TextAppearanceFactory.java",
-      "src/**/quicksearchbox/VoiceSearch.java",
-    ],
     static_libs: [
             "guava",
             "android-common",
@@ -139,23 +38,4 @@ android_app {
     },
 
     kotlincflags: ["-Werror"],
-}
-
-android_app {
-    name: "QuickSearchBoxJava",
-    sdk_version: "current",
-    static_libs: [
-        "guava",
-        "android-common",
-    ],
-    srcs: [
-        "src/**/*.java",
-        "src/**/*.logtags",
-    ],
-    certificate: "shared",
-    product_specific: true,
-    resource_dirs: ["res"],
-    optimize: {
-        proguard_flags_files: ["proguard.flags"],
-    },
-}
+}
\ No newline at end of file