Skip to content
Snippets Groups Projects
Commit 2d6c4278 authored by Anton Hansson's avatar Anton Hansson
Browse files

Make framework-all composed of other framework jars

This avoids duplicating the compilation of the module java source
code, as well as maintaining the compilation rules in two places.

Bug: 149906971
Test: m FrameworkServicesRoboTests
Change-Id: I1cea62aaedb7e653648130e3d315761c0c9aece4
parent 6d411c83
No related branches found
No related tags found
No related merge requests found
......@@ -366,7 +366,8 @@ filegroup {
":framework-tethering-srcs",
":framework-wifi-updatable-sources",
":updatable-media-srcs",
]
],
visibility: ["//visibility:private"],
}
java_library {
......@@ -383,7 +384,31 @@ java_library {
"framework-wifi.stubs.module_lib",
],
sdk_version: "module_current",
visibility: [":__pkg__"],
visibility: ["//visibility:private"],
}
java_library {
name: "framework-all",
installable: false,
static_libs: [
"framework-minus-apex",
"framework-appsearch",
"framework-graphics.impl",
"framework-mediaprovider.impl",
"framework-permission.impl",
"framework-sdkextensions.impl",
"framework-statsd.impl",
"framework-tethering.impl",
"framework-wifi.impl",
"updatable-media",
],
apex_available: ["//apex_available:platform"],
sdk_version: "core_platform",
visibility: [
// DO NOT ADD ANY MORE ENTRIES TO THIS LIST
"//external/robolectric-shadows:__subpackages__",
"//frameworks/layoutlib:__subpackages__",
],
}
filegroup {
......@@ -615,32 +640,6 @@ java_library {
apex_available: ["//apex_available:platform"],
}
java_library {
name: "framework-all",
defaults: ["framework-defaults"],
srcs: [":framework-all-sources"],
installable: false,
static_libs: [
"exoplayer2-extractor",
"android.hardware.wifi-V1.0-java-constants",
"mediatranscoding_aidl_interface-java",
// Additional dependencies needed to build the ike API classes.
"ike-internals",
],
plugins: [
"intdef-annotation-processor",
],
libs: ["icing-java-proto-lite"],
apex_available: ["//apex_available:platform"],
visibility: [
// DO NOT ADD ANY MORE ENTRIES TO THIS LIST
"//external/robolectric-shadows:__subpackages__",
"//frameworks/base",
"//frameworks/layoutlib:__subpackages__",
],
}
platform_compat_config {
name: "framework-platform-compat-config",
src: ":framework-minus-apex",
......
......@@ -106,7 +106,10 @@ java_defaults {
stubs_library_visibility: ["//visibility:public"],
// Hide impl library and stub sources
impl_library_visibility: [":__package__"],
impl_library_visibility: [
":__package__",
"//frameworks/base", // For framework-all
],
stubs_source_visibility: ["//visibility:private"],
// Collates API usages from each module for further analysis.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment