diff options
| author | 2019-11-30 20:59:43 -0800 | |
|---|---|---|
| committer | 2019-11-30 20:59:43 -0800 | |
| commit | 6ecd9b025e4507dba9975d8d8f859cefb794703c (patch) | |
| tree | c05bf920f902ff88ed935616c89893963ef5b952 | |
| parent | d2958bb368db38703466d35d17fd3f390419ceae (diff) | |
| parent | c21fae57f83ee77e226f227d4d0bd14b748a9497 (diff) | |
Merge "Tweak framework-mime / mimemap dependencies." am: 8f05b2ef50
am: c21fae57f8
Change-Id: I59f650eee4d7861e5d539be3a88c72bc17e13ad2
| -rw-r--r-- | Android.bp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index 2e8e90786b32..68a35101b328 100644 --- a/Android.bp +++ b/Android.bp @@ -222,7 +222,6 @@ filegroup { ":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 { filegroup { name: "framework-all-sources", srcs: [ + ":framework-mime-sources", ":framework-non-updatable-sources", ":updatable-media-srcs", ], @@ -365,7 +365,6 @@ java_defaults { static_libs: [ "framework-internal-utils", - "mimemap", ], required: [ @@ -426,6 +425,9 @@ java_library { "libcore-platform-compat-config", "services-platform-compat-config", ], + static_libs: [ + "mimemap", + ], // For backwards compatibility. stem: "framework", } @@ -969,6 +971,7 @@ stubs_defaults { name: "framework-doc-stubs-default", srcs: [ ":framework-non-updatable-sources", + ":framework-mime-sources", "core/java/**/*.logtags", "test-base/src/**/*.java", ":opt-telephony-srcs", |