Reference framework-connectivity stubs explicitly

To merge the framework-connectivity and framework-connectivity.impl
targets, framework-connectivity stubs need to be referenced explicitly
in java_sdk_libraries, otherwise the build system will currently see
dependency cycles.

Bug: 183600168
Test: m
Ignore-AOSP-First: Needs manual cherry-picks
Change-Id: I556747f9ba934f8b44b6ea9a518adbccc84ac2a9
This commit is contained in:
Remi NGUYEN VAN
2021-03-24 22:50:35 +09:00
parent 592d72bf4c
commit 02b94faf80

View File

@@ -26,8 +26,8 @@ java_sdk_library {
], ],
srcs: [":framework-tethering-srcs"], srcs: [":framework-tethering-srcs"],
libs: ["framework-connectivity"], libs: ["framework-connectivity.stubs.module_lib"],
stub_only_libs: ["framework-connectivity"], stub_only_libs: ["framework-connectivity.stubs.module_lib"],
aidl: { aidl: {
include_dirs: [ include_dirs: [
"frameworks/base/packages/Connectivity/framework/aidl-export", "frameworks/base/packages/Connectivity/framework/aidl-export",