diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 286 |
1 files changed, 217 insertions, 69 deletions
diff --git a/Android.bp b/Android.bp index b2ed0de2f2e9..ff17260426e9 100644 --- a/Android.bp +++ b/Android.bp @@ -26,48 +26,166 @@ // READ ME: ######################################################## filegroup { - name: "framework-defaults-java-srcs", + name: "framework-core-sources", srcs: [ - // java sources under this directory "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", + ], + 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", + "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 = [ - // 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", @@ -88,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", + ], }, } @@ -137,13 +236,9 @@ java_defaults { defaults: ["framework-aidl-export-defaults"], installable: true, - srcs: [ - ":framework-defaults-java-srcs", - ] + framework_srcs, + srcs: framework_srcs, aidl: { - local_include_dirs: framework_aidl_local_include_dirs, - include_dirs: framework_aidl_external_include_dirs, generate_get_transaction_name: true, }, @@ -161,6 +256,7 @@ java_defaults { jarjar_rules: ":framework-jarjar-rules", static_libs: [ + "mimemap", "apex_aidl_interface-java", "suspend_control_aidl_interface-java", "framework-protos", @@ -793,7 +889,6 @@ stubs_defaults { ":jobscheduler-framework-source", ], srcs_lib: "framework-minus-apex", - srcs_lib_whitelist_dirs: frameworks_base_subdirs, srcs_lib_whitelist_pkgs: packages_to_document, libs: framework_docs_only_libs, local_sourcepaths: frameworks_base_subdirs, @@ -841,6 +936,11 @@ doc_defaults { create_stubs: false, } +doc_defaults { + name: "framework-dokka-docs-default", + create_stubs: false, +} + stubs_defaults { name: "metalava-api-stubs-default", srcs: [ @@ -851,7 +951,6 @@ stubs_defaults { ":jobscheduler-framework-source", ], srcs_lib: "framework-minus-apex", - srcs_lib_whitelist_dirs: frameworks_base_subdirs, srcs_lib_whitelist_pkgs: packages_to_document, local_sourcepaths: frameworks_base_subdirs, installable: false, @@ -1015,7 +1114,7 @@ droiddoc { } droiddoc { - name: "ds-docs", + name: "ds-docs-java", defaults: ["framework-docs-default"], srcs: [ ":framework-doc-stubs", @@ -1044,6 +1143,58 @@ droiddoc { } droiddoc { + name: "ds-docs-kt", + defaults: ["framework-dokka-docs-default"], + srcs: [ + ":framework-doc-stubs", + ], + args: "-noJdkLink -links https://kotlinlang.org/api/latest/jvm/stdlib/^external/dokka/package-list " + + "-noStdlibLink", + proofread_file: "ds-dokka-proofread.txt", + dokka_enabled: true, +} + +java_genrule { + name: "ds-docs", + tools: [ + "zip2zip", + "merge_zips", + ], + srcs: [ + ":ds-docs-java{.docs.zip}", + ":ds-docs-kt{.docs.zip}", + ], + out: ["ds-docs.zip"], + dist: { + targets: ["docs"], + }, + cmd: "$(location zip2zip) -i $(location :ds-docs-kt{.docs.zip}) -o $(genDir)/ds-docs-kt-moved.zip **/*:en/reference/kotlin && " + + "$(location merge_zips) $(out) $(location :ds-docs-java{.docs.zip}) $(genDir)/ds-docs-kt-moved.zip", +} + +java_genrule { + name: "ds-docs-switched", + tools: [ + "switcher4", + "soong_zip", + ], + srcs: [ + ":ds-docs-java{.docs.zip}", + ":ds-docs-kt{.docs.zip}", + ], + out: ["ds-docs-switched.zip"], + dist: { + targets: ["docs"], + }, + cmd: "unzip $(location :ds-docs-java{.docs.zip}) -d $(genDir) && " + + "unzip $(location :ds-docs-kt{.docs.zip}) -d $(genDir)/en/reference/kotlin && " + + "SWITCHER=$$(cd $$(dirname $(location switcher4)) && pwd)/$$(basename $(location switcher4)) && " + + "(cd $(genDir)/en/reference && $$SWITCHER --work platform) && " + + "$(location soong_zip) -o $(out) -C $(genDir) -D $(genDir)", +} + + +droiddoc { name: "ds-static-docs", defaults: ["framework-docs-default"], srcs: [ @@ -1173,7 +1324,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", @@ -1313,8 +1463,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", } |