diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 67 |
1 files changed, 30 insertions, 37 deletions
diff --git a/Android.bp b/Android.bp index bc72e9ae7164..9d05ffd3de8c 100644 --- a/Android.bp +++ b/Android.bp @@ -28,47 +28,29 @@ filegroup { name: "framework-defaults-java-srcs", srcs: [ - // From build/make/core/pathmap.mk FRAMEWORK_BASE_SUBDIRS + // java sources under this directory "core/java/**/*.java", + "drm/java/**/*.java", "graphics/java/**/*.java", + "keystore/java/**/*.java", "location/java/**/*.java", "lowpan/java/**/*.java", "media/java/**/*.java", "media/mca/effect/java/**/*.java", "media/mca/filterfw/java/**/*.java", "media/mca/filterpacks/java/**/*.java", - "drm/java/**/*.java", "opengl/java/**/*.java", + "rs/java/**/*.java", "sax/java/**/*.java", "telecomm/java/**/*.java", "telephony/java/**/*.java", "wifi/java/**/*.java", - "keystore/java/**/*.java", - "rs/java/**/*.java", ], } // TODO(b/70046217): make these as filegroups where the base directory for aidl files // is given as 'path'. Eliminate the need for aidl_local_include_dirs. framework_srcs = [ - // java sources under this directory - "core/java/**/*.java", - "drm/java/**/*.java", - "graphics/java/**/*.java", - "keystore/java/**/*.java", - "location/java/**/*.java", - "lowpan/java/**/*.java", - "media/java/**/*.java", - "media/mca/effect/java/**/*.java", - "media/mca/filterfw/java/**/*.java", - "media/mca/filterpacks/java/**/*.java", - "opengl/java/**/*.java", - "rs/java/**/*.java", - "sax/java/**/*.java", - "telecomm/java/**/*.java", - "telephony/java/**/*.java", - "wifi/java/**/*.java", - // aidl under this directory // b/70046217#comment15 These MUST come after all java srcs. // TODO(b/70046217) remove the above requirement @@ -102,10 +84,8 @@ framework_srcs = [ // etc. "core/java/**/*.logtags", - ":apex-properties", ":framework-javastream-protos", ":framework-statslog-gen", - ":platform-properties", ] framework_aidl_local_include_dirs = [ @@ -157,7 +137,9 @@ java_defaults { defaults: ["framework-aidl-export-defaults"], installable: true, - srcs: framework_srcs, + srcs: [ + ":framework-defaults-java-srcs", + ] + framework_srcs, aidl: { local_include_dirs: framework_aidl_local_include_dirs, @@ -208,6 +190,9 @@ java_defaults { "android.hardware.vibrator-V1.3-java", "android.hardware.wifi-V1.0-java-constants", "devicepolicyprotosnano", + + "com.android.sysprop.apex", + "PlatformProperties", ], required: [ @@ -220,7 +205,10 @@ java_defaults { "--multi-dex", ], - plugins: ["view-inspector-annotation-processor"], + plugins: [ + "view-inspector-annotation-processor", + "staledataclass-annotation-processor", + ], } filegroup { @@ -257,13 +245,24 @@ filegroup { } java_library { - name: "framework", + name: "framework-minus-apex", defaults: ["framework-defaults"], javac_shard_size: 150, +} + +java_library { + name: "framework", + defaults: ["framework-aidl-export-defaults"], + installable: true, + static_libs: [ + "framework-minus-apex", + "jobscheduler-framework", + ], required: [ "framework-platform-compat-config", "libcore-platform-compat-config", ], + sdk_version: "core_platform", } java_library { @@ -732,16 +731,13 @@ framework_docs_only_libs = [ "android-support-compat", "android-support-core-ui", "android-support-core-utils", - "android-support-customtabs", "android-support-design", "android-support-dynamic-animation", "android-support-exifinterface", "android-support-fragment", "android-support-media-compat", "android-support-percent", - "android-support-recommendation", "android-support-transition", - "android-support-tv-provider", "android-support-v7-cardview", "android-support-v7-gridlayout", "android-support-v7-mediarouter", @@ -750,15 +746,10 @@ framework_docs_only_libs = [ "android-support-v13", "android-support-v14-preference", "android-support-v17-leanback", - "android-support-v17-preference-leanback", - "android-support-wear", "android-support-vectordrawable", "android-support-animatedvectordrawable", "android-support-v7-appcompat", "android-support-v7-recyclerview", - "android-support-emoji", - "android-support-emoji-appcompat", - "android-support-emoji-bundled", "android-support-v8-renderscript", "android-support-multidex", "android-support-multidex-instrumentation", @@ -798,8 +789,9 @@ stubs_defaults { ":updatable-media-srcs-without-aidls", "test-mock/src/**/*.java", "test-runner/src/**/*.java", + ":jobscheduler-framework-source", ], - srcs_lib: "framework", + srcs_lib: "framework-minus-apex", srcs_lib_whitelist_dirs: frameworks_base_subdirs, srcs_lib_whitelist_pkgs: packages_to_document, libs: framework_docs_only_libs, @@ -855,8 +847,9 @@ stubs_defaults { ":opt-net-voip-srcs", ":core_public_api_files", ":updatable-media-srcs-without-aidls", + ":jobscheduler-framework-source", ], - srcs_lib: "framework", + srcs_lib: "framework-minus-apex", srcs_lib_whitelist_dirs: frameworks_base_subdirs, srcs_lib_whitelist_pkgs: packages_to_document, local_sourcepaths: frameworks_base_subdirs, |