diff options
| author | 2019-11-22 16:33:18 +0000 | |
|---|---|---|
| committer | 2019-11-29 17:21:08 +0000 | |
| commit | c0c06088f0d5918a0300e7c77753be53e17d3a9c (patch) | |
| tree | bc8db3ac76dc6603e6a2c0114c2a7be98f95455d | |
| parent | 2a095b1fdc49237b18617f4c0a4196b23034e4c5 (diff) | |
Tweak framework-mime / mimemap dependencies.
This CL addresses an outstanding review comment from
https://r.android.com/1115772 . To be honest, I don't
fully get the semantics of what I've changed, so I've
followed Jiyong's suggestions pretty blindly, except
that I've added the static dependency on mimemap to
framework-minus-apex as opposed to the (non-existing)
frameworks.
Test: Confirmed that the data files are still in framework.jar by
rebuilding (make installclean && make droid && flashall )
and then running:
adb shell su 0 unzip -l /system/framework/framework.jar | grep types
Test: atest CtsMimeMapTestCases
Change-Id: Icfa5aba8455c7460063d1e4812c71c5a2c0c6c90
| -rw-r--r-- | Android.bp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index f60cbda91f38..f741170662da 100644 --- a/Android.bp +++ b/Android.bp @@ -225,7 +225,6 @@ filegroup { ":framework-mca-filterfw-sources", ":framework-mca-filterpacks-sources", ":framework-media-sources", - ":framework-mime-sources", ":framework-mms-sources", ":framework-opengl-sources", ":framework-rs-sources", @@ -269,6 +268,7 @@ filegroup { filegroup { name: "framework-all-sources", srcs: [ + ":framework-mime-sources", ":framework-non-updatable-sources", ":updatable-media-srcs", ], @@ -375,7 +375,6 @@ java_defaults { static_libs: [ "framework-internal-utils", - "mimemap", ], dxflags: [ @@ -438,6 +437,9 @@ java_library { "media-provider-platform-compat-config", "services-devicepolicy-platform-compat-config", ], + static_libs: [ + "mimemap", + ], // For backwards compatibility. stem: "framework", } @@ -1016,6 +1018,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", |