diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2021-01-28 13:37:03 +0900 |
|---|---|---|
| committer | Remi NGUYEN VAN <reminv@google.com> | 2021-02-26 19:23:25 +0900 |
| commit | c15d99e6ff30ea04fa5a4afcabaf8b03f4e2b6ae (patch) | |
| tree | 5523b0f6d01b065e828ed825814a3109f2bd1023 /Android.bp | |
| parent | fcfec6bf2eb36033df829c0f546b3441077b2e96 (diff) | |
Split out the connectivity API surface
Split out connectivity APIs to connectivity module directories. This
prepares future move of the connectivity code into a mainline module,
but still keeps it implemented by framework-minus-apex for now: the API
stubs are moved to framework-connectivity.stubs, but the implementation
on device remains in the same place.
This allows moving the connectivity code in/out of APEX with minimal
changes.
BYPASS_INCLUSIVE_LANGUAGE_REASON=Moving files, can't modify released API
Bug: 171540887
Test: device boots, connectivity working
Merged-In: I21c42f032efa6c10e36c749df3183ce9679303a7
(cherry-pick from internal branch with API files conflicts)
Change-Id: I21c42f032efa6c10e36c749df3183ce9679303a7
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index 88ed676aae69..0d7deb1bfd5e 100644 --- a/Android.bp +++ b/Android.bp @@ -333,7 +333,6 @@ filegroup { srcs: [ // Java/AIDL sources under frameworks/base ":framework-blobstore-sources", - ":framework-connectivity-sources", // framework-connectivity is not yet a module ":framework-core-sources", ":framework-drm-sources", ":framework-graphics-sources", @@ -395,6 +394,7 @@ filegroup { filegroup { name: "framework-updatable-sources", srcs: [ + ":framework-connectivity-sources", ":framework-mediaprovider-sources", ":framework-permission-sources", ":framework-sdkextensions-sources", @@ -580,6 +580,7 @@ java_library { defaults: ["framework-aidl-export-defaults"], srcs: [ ":framework-non-updatable-sources", + ":framework-connectivity-sources", "core/java/**/*.logtags", ], // See comment on framework-atb-backward-compatibility module below @@ -628,6 +629,8 @@ java_library { apex_available: ["//apex_available:platform"], visibility: [ "//frameworks/base", + // TODO: remove when framework-connectivity can build against API + "//frameworks/base/packages/Connectivity/framework", // TODO(b/147128803) remove the below lines "//frameworks/base/apex/blobstore/framework", "//frameworks/base/apex/jobscheduler/framework", @@ -1281,6 +1284,7 @@ java_library { ], libs: [ "framework-annotations-lib", + "framework-connectivity", "unsupportedappusage", ], visibility: [ |