diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 278 |
1 files changed, 180 insertions, 98 deletions
diff --git a/Android.bp b/Android.bp index 731a6728e664..9e838b3efcc1 100644 --- a/Android.bp +++ b/Android.bp @@ -26,66 +26,166 @@ // READ ME: ######################################################## filegroup { - name: "framework-defaults-java-srcs", + name: "framework-core-sources", srcs: [ - // From build/make/core/pathmap.mk FRAMEWORK_BASE_SUBDIRS "core/java/**/*.java", + "core/java/**/*.aidl", + ], + path: "core/java", +} + +filegroup { + name: "framework-drm-sources", + srcs: [ + "drm/java/**/*.java", + ], + path: "drm/java", +} + +filegroup { + name: "framework-graphics-sources", + srcs: [ "graphics/java/**/*.java", + "graphics/java/**/*.aidl", + ], + path: "graphics/java", +} + +filegroup { + name: "framework-keystore-sources", + srcs: [ + "keystore/java/**/*.java", + "keystore/java/**/*.aidl", + ], + path: "keystore/java", +} + +filegroup { + name: "framework-location-sources", + srcs: [ "location/java/**/*.java", + "location/java/**/*.aidl", + ], + path: "location/java", +} + +filegroup { + name: "framework-lowpan-sources", + srcs: [ "lowpan/java/**/*.java", + "lowpan/java/**/*.aidl", + ], + path: "lowpan/java", +} + +filegroup { + name: "framework-media-sources", + srcs: [ "media/java/**/*.java", + "media/java/**/*.aidl", + ], + path: "media/java", +} + +filegroup { + name: "framework-mca-effect-sources", + srcs: [ "media/mca/effect/java/**/*.java", + ], + path: "media/mca/effect/java", +} + +filegroup { + name: "framework-mca-filterfw-sources", + srcs: [ "media/mca/filterfw/java/**/*.java", + ], + path: "media/mca/filterfw/java", +} + +filegroup { + name: "framework-mca-filterpacks-sources", + srcs: [ "media/mca/filterpacks/java/**/*.java", - "drm/java/**/*.java", + ], + path: "media/mca/filterpacks/java", +} + +filegroup { + name: "framework-opengl-sources", + srcs: [ "opengl/java/**/*.java", + ], + path: "opengl/java", +} + +filegroup { + name: "framework-rs-sources", + srcs: [ + "rs/java/**/*.java", + ], + path: "rs/java", +} + +filegroup { + name: "framework-sax-sources", + srcs: [ "sax/java/**/*.java", + ], + path: "sax/java", +} + +filegroup { + name: "framework-telecomm-sources", + srcs: [ "telecomm/java/**/*.java", + "telecomm/java/**/*.aidl", + ], + path: "telecomm/java", +} + +filegroup { + name: "framework-telephony-sources", + srcs: [ "telephony/java/**/*.java", + "telephony/java/**/*.aidl", + ], + path: "telephony/java", +} + +filegroup { + name: "framework-wifi-sources", + srcs: [ "wifi/java/**/*.java", - "keystore/java/**/*.java", - "rs/java/**/*.java", + "wifi/java/**/*.aidl", ], + path: "wifi/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 - "core/java/**/*.aidl", - "graphics/java/**/*.aidl", - "keystore/java/**/*.aidl", - "location/java/**/*.aidl", - "lowpan/java/**/*.aidl", - "media/java/**/*.aidl", - "packages/services/PacProcessor/**/*.aidl", - "packages/services/Proxy/**/*.aidl", - "telecomm/java/**/*.aidl", - "telephony/java/**/*.aidl", - "wifi/java/**/*.aidl", - - // aidl from external directories + // Java/AIDL sources under frameworks/base + ":framework-core-sources", + ":framework-drm-sources", + ":framework-graphics-sources", + ":framework-keystore-sources", + ":framework-location-sources", + ":framework-lowpan-sources", + ":framework-media-sources", + ":framework-mca-effect-sources", + ":framework-mca-filterfw-sources", + ":framework-mca-filterpacks-sources", + ":framework-opengl-sources", + ":framework-rs-sources", + ":framework-sax-sources", + ":framework-telecomm-sources", + ":framework-telephony-sources", + ":framework-wifi-sources", + ":PacProcessor-aidl-sources", + ":ProxyHandler-aidl-sources", + + // AIDL sources from external directories ":dumpstate_aidl", + ":framework_native_aidl", ":gatekeeper_aidl", ":gsiservice_aidl", ":incidentcompanion_aidl", @@ -106,47 +206,28 @@ framework_srcs = [ ":framework-statslog-gen", ] -framework_aidl_local_include_dirs = [ - "core/java", - "drm/java", - "graphics/java", - "keystore/java", - "location/java", - "lowpan/java", - "media/java", - "media/apex/java", - "media/mca/effect/java", - "media/mca/filterfw/java", - "media/mca/filterpacks/java", - "opengl/java", - "rs/java", - "sax/java", - "telecomm/java", - "telephony/java", - "wifi/java", -] - -framework_aidl_external_include_dirs = [ - "frameworks/av/camera/aidl", - "frameworks/av/media/libaudioclient/aidl", - "frameworks/native/aidl/binder", - "frameworks/native/aidl/gui", - "frameworks/native/cmds/dumpstate/binder", - "frameworks/native/libs/incidentcompanion/binder", - "system/bt/binder", - "system/core/gatekeeperd/binder", - "system/core/storaged/binder", - "system/gsid/aidl", - "system/security/keystore/binder", - "system/update_engine/binder_bindings", - "system/vold/binder", -] - java_defaults { name: "framework-aidl-export-defaults", - aidl: { - export_include_dirs: framework_aidl_local_include_dirs, + export_include_dirs: [ + "core/java", + "drm/java", + "graphics/java", + "keystore/java", + "location/java", + "lowpan/java", + "media/java", + "media/apex/java", + "media/mca/effect/java", + "media/mca/filterfw/java", + "media/mca/filterpacks/java", + "opengl/java", + "rs/java", + "sax/java", + "telecomm/java", + "telephony/java", + "wifi/java", + ], }, } @@ -158,8 +239,6 @@ java_defaults { srcs: framework_srcs, aidl: { - local_include_dirs: framework_aidl_local_include_dirs, - include_dirs: framework_aidl_external_include_dirs, generate_get_transaction_name: true, }, @@ -222,7 +301,10 @@ java_defaults { "--multi-dex", ], - plugins: ["view-inspector-annotation-processor"], + plugins: [ + "view-inspector-annotation-processor", + "staledataclass-annotation-processor", + ], } filegroup { @@ -259,14 +341,25 @@ 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", "services-platform-compat-config", ], + sdk_version: "core_platform", } java_library { @@ -735,16 +828,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", @@ -753,15 +843,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", @@ -801,9 +886,9 @@ stubs_defaults { ":updatable-media-srcs-without-aidls", "test-mock/src/**/*.java", "test-runner/src/**/*.java", + ":jobscheduler-framework-source", ], - srcs_lib: "framework", - srcs_lib_whitelist_dirs: frameworks_base_subdirs, + srcs_lib: "framework-minus-apex", srcs_lib_whitelist_pkgs: packages_to_document, libs: framework_docs_only_libs, local_sourcepaths: frameworks_base_subdirs, @@ -858,9 +943,9 @@ stubs_defaults { ":opt-net-voip-srcs", ":core_public_api_files", ":updatable-media-srcs-without-aidls", + ":jobscheduler-framework-source", ], - srcs_lib: "framework", - srcs_lib_whitelist_dirs: frameworks_base_subdirs, + srcs_lib: "framework-minus-apex", srcs_lib_whitelist_pkgs: packages_to_document, local_sourcepaths: frameworks_base_subdirs, installable: false, @@ -1182,7 +1267,6 @@ droidstubs { name: "hiddenapi-mappings", defaults: ["metalava-api-stubs-default"], srcs: [ - ":framework-defaults-java-srcs", ":non_openjdk_java_files", ":openjdk_java_files", ":opt-telephony-common-srcs", @@ -1322,8 +1406,6 @@ filegroup { aidl_mapping { name: "framework-aidl-mappings", srcs: framework_srcs, - local_include_dirs: framework_aidl_local_include_dirs, - include_dirs: framework_aidl_external_include_dirs, output: "framework-aidl-mappings.txt", } |