diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp index 4a2236980fa3..6c5acd2b416b 100644 --- a/Android.bp +++ b/Android.bp @@ -273,6 +273,14 @@ java_library { installable: false, } +// NOTE: This filegroup is exposed for vendor libraries to depend on and is referenced in +// documentation. Do not remove without consulting the treble/hidl teams. +filegroup { + name: "framework-jarjar-rules", + srcs: ["framework-jarjar-rules.txt"], + visibility: ["//visibility:public"], +} + java_defaults { name: "framework-minus-apex-defaults", defaults: ["framework-aidl-export-defaults"], @@ -284,16 +292,17 @@ java_defaults { generate_get_transaction_name: true, local_include_dirs: [ "media/aidl", - // TODO: move to include_dirs when migrated to packages/modules - "packages/Connectivity/framework/aidl-export", ], - include_dirs: ["frameworks/av/aidl"], + include_dirs: [ + "frameworks/av/aidl", + "packages/modules/Connectivity/framework/aidl-export", + ], }, dxflags: [ "--core-library", "--multi-dex", ], - jarjar_rules: "framework-jarjar-rules.txt", + jarjar_rules: ":framework-jarjar-rules", javac_shard_size: 150, plugins: [ "view-inspector-annotation-processor", @@ -524,12 +533,12 @@ stubs_defaults { local_include_dirs: [ "apex/media/aidl/stable", "media/aidl", - // TODO: move to include-dirs for packages/modules/Connectivity when this moves out of - // frameworks/base - "packages/Connectivity/framework/aidl-export", "telephony/java", ], - include_dirs: ["frameworks/av/aidl"], + include_dirs: [ + "frameworks/av/aidl", + "packages/modules/Connectivity/framework/aidl-export", + ], }, // These are libs from framework-internal-utils that are required (i.e. being referenced) // from framework-non-updatable-sources. Add more here when there's a need. |