commit 8f05b2ef50d7e6478f0ffc17628fdeb270039a54
author Treehugger Robot <treehugger-gerrit@google.com> Sun Dec 01 04:35:34 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Dec 01 04:35:34 2019 +0000
tree 6a11b0d1f9ea13ad4d44d673be671c4513d01dd3
parent e8401aff922b4935162893be9b9b9b714d95d81c
parent 17d0c59338690c006e1e154f76c47bd43b95a7cc

Merge "Tweak framework-mime / mimemap dependencies."

Android.bp

diff --git a/Android.bp b/Android.bp
index 2e8e907..68a3510 100644
--- a/Android.bp
+++ b/Android.bp
@@ -222,7 +222,6 @@
         ":framework-mca-effect-sources",
         ":framework-mca-filterfw-sources",
         ":framework-mca-filterpacks-sources",
-        ":framework-mime-sources",
         ":framework-mms-sources",
         ":framework-opengl-sources",
         ":framework-rs-sources",
@@ -266,6 +265,7 @@
 filegroup {
     name: "framework-all-sources",
     srcs: [
+        ":framework-mime-sources",
         ":framework-non-updatable-sources",
         ":updatable-media-srcs",
     ],
@@ -365,7 +365,6 @@
 
     static_libs: [
         "framework-internal-utils",
-        "mimemap",
     ],
 
     required: [
@@ -426,6 +425,9 @@
         "libcore-platform-compat-config",
         "services-platform-compat-config",
     ],
+    static_libs: [
+        "mimemap",
+    ],
     // For backwards compatibility.
     stem: "framework",
 }
@@ -969,6 +971,7 @@
     name: "framework-doc-stubs-default",
     srcs: [
         ":framework-non-updatable-sources",
+        ":framework-mime-sources",
         "core/java/**/*.logtags",
         "test-base/src/**/*.java",
         ":opt-telephony-srcs",