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 Merged-In: Icfa5aba8455c7460063d1e4812c71c5a2c0c6c90
This commit is contained in:
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user