diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp index 8d7ab983593d..d6b303f62428 100644 --- a/Android.bp +++ b/Android.bp @@ -97,7 +97,7 @@ filegroup { // AIDL sources from external directories ":android.frameworks.location.altitude-V2-java-source", ":android.hardware.biometrics.common-V4-java-source", - ":android.hardware.biometrics.fingerprint-V3-java-source", + ":android.hardware.biometrics.fingerprint-V5-java-source", ":android.hardware.biometrics.face-V4-java-source", ":android.hardware.gnss-V2-java-source", ":android.hardware.graphics.common-V3-java-source", @@ -150,7 +150,6 @@ filegroup { ":framework-javastream-protos", ":statslog-framework-java-gen", // FrameworkStatsLog.java ":audio_policy_configuration_V7_0", - ":perfetto_trace_javastream_protos", ], } @@ -355,8 +354,11 @@ java_defaults { "packages/modules/Media/apex/aidl/stable", "hardware/interfaces/biometrics/common/aidl", "hardware/interfaces/biometrics/fingerprint/aidl", + "hardware/interfaces/common/aidl", + "hardware/interfaces/common/fmq/aidl", "hardware/interfaces/graphics/common/aidl", "hardware/interfaces/keymaster/aidl", + "hardware/interfaces/power/aidl", "system/hardware/interfaces/media/aidl", ], }, @@ -386,8 +388,6 @@ java_defaults { // TODO(b/120066492): remove gps_debug and protolog.conf.json when the build // system propagates "required" properly. "gps_debug.conf", - "protolog.conf.json.gz", - "core.protolog.pb", "framework-res", // any install dependencies should go into framework-minus-apex-install-dependencies // rather than here to avoid bloating incremental build time @@ -424,6 +424,7 @@ java_defaults { "audiopolicy-aidl-java", "sounddose-aidl-java", "modules-utils-expresslog", + "perfetto_trace_javastream_protos_jarjar", ], } @@ -663,6 +664,16 @@ filegroup { visibility: ["//frameworks/base/api"], } +java_library { + name: "perfetto_trace_javastream_protos_jarjar", + srcs: [ + ":perfetto_trace_javastream_protos", + ], + jarjar_rules: ":framework-jarjar-rules", + sdk_version: "core_platform", + installable: false, +} + build = [ "AconfigFlags.bp", "ProtoLibraries.bp", |