Merge "Tweak framework-mime / mimemap dependencies."
am: 8f05b2ef50
Change-Id: I9fe70f6e9fd8aae52a3e3f8ee140972513fb091f
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",