diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2020-11-12 03:32:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-11-12 03:32:49 +0000 |
| commit | 4c8512659130610a232435d87b0ca74eed5b9581 (patch) | |
| tree | 96c632eac88dbe9a63f3da0e75091e84b032c1b4 /wifi/Android.bp | |
| parent | ad8a87b69e54a869d3d33f99ee29d6e4b60c2dd5 (diff) | |
| parent | 52a87d283911c9332f610ee6b471f76ea6b192d0 (diff) | |
Merge "Add dependency on modules-utils-build"
Diffstat (limited to 'wifi/Android.bp')
| -rw-r--r-- | wifi/Android.bp | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/wifi/Android.bp b/wifi/Android.bp index 1cc5073c5f71..8b89959a4f05 100644 --- a/wifi/Android.bp +++ b/wifi/Android.bp @@ -76,25 +76,34 @@ test_access_hidden_api_whitelist = [ "//packages/apps/Settings/tests/robotests", // TODO(b/161767237): remove ] -// wifi-service needs pre-jarjared version of framework-wifi so it can reference copied utility -// classes before they are renamed. -java_library { - name: "framework-wifi-pre-jarjar", +// defaults shared between `framework-wifi` & `framework-wifi-pre-jarjar` +// java_sdk_library `framework-wifi` needs sources to generate stubs, so it cannot reuse +// `framework-wifi-pre-jarjar` +java_defaults { + name: "framework-wifi-defaults", defaults: ["wifi-module-sdk-version-defaults"], - sdk_version: "module_current", static_libs: [ "framework-wifi-util-lib", "android.hardware.wifi-V1.0-java-constants", + "modules-utils-build", ], libs: [ - "framework-annotations-lib", "unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage ], srcs: [ ":framework-wifi-updatable-sources", ":framework-wifi-util-lib-aidls", ], - // java_api_finder must accompany `srcs` +} + +// wifi-service needs pre-jarjared version of framework-wifi so it can reference copied utility +// classes before they are renamed. +java_library { + name: "framework-wifi-pre-jarjar", + defaults: ["framework-wifi-defaults"], + sdk_version: "module_current", + libs: ["framework-annotations-lib"], + // java_api_finder must accompany `srcs` (`srcs` defined in `framework-wifi-defaults`) plugins: ["java_api_finder"], installable: false, visibility: [ @@ -108,18 +117,7 @@ java_sdk_library { name: "framework-wifi", defaults: [ "framework-module-defaults", - "wifi-module-sdk-version-defaults", - ], - static_libs: [ - "framework-wifi-util-lib", - "android.hardware.wifi-V1.0-java-constants", - ], - libs: [ - "unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage - ], - srcs: [ - ":framework-wifi-updatable-sources", - ":framework-wifi-util-lib-aidls", + "framework-wifi-defaults", ], jarjar_rules: ":wifi-jarjar-rules", |