commit 04a05a8bb277f6e68c752f0f0392ab3c1054f539
author Alexander Dorokhine <adorokhine@google.com> Tue Dec 17 10:41:21 2019 -0800
committer Alexander Dorokhine <adorokhine@google.com> Tue Dec 17 10:41:21 2019 -0800
tree c4d70afdba5f33cf6cd95af4d792ca629872e241
parent 98be60dd24b2db8a5891a957ea125a0325a821bf

Move framework-appsearch out of framework.jar.

Test: CtsAppSearchTestCases
Bug: 146218515
Change-Id: I55a8732e54e46877ee448973d735ded2870d9443

Android.bp

diff --git a/Android.bp b/Android.bp
index 9ffdd1d..21552695 100644
--- a/Android.bp
+++ b/Android.bp
@@ -203,7 +203,6 @@
     name: "framework-non-updatable-sources",
     srcs: [
         // Java/AIDL sources under frameworks/base
-        ":framework-appsearch-sources",
         ":framework-blobstore-sources",
         ":framework-core-sources",
         ":framework-drm-sources",
@@ -262,6 +261,7 @@
 filegroup {
     name: "framework-updatable-sources",
     srcs: [
+        ":framework-appsearch-sources",
         ":framework-sdkext-sources",
         ":framework-statsd-sources",
         ":updatable-media-srcs",
@@ -427,6 +427,7 @@
     defaults: ["framework-defaults"],
     srcs: [":framework-non-updatable-sources"],
     libs: [
+        "framework-appsearch-stubs",
         // TODO(b/146167933): Use framework-statsd-stubs
         "framework-statsd",
         "framework-wifi-stubs",
@@ -466,6 +467,7 @@
     installable: false, // this lib is a build-only library
     static_libs: [
         "framework-minus-apex",
+        "framework-appsearch", // TODO(b/146218515): should be framework-appsearch-stubs
         "framework-sdkext-stubs-systemapi",
         // TODO(b/146167933): Use framework-statsd-stubs instead.
         "framework-statsd",