From c15d99e6ff30ea04fa5a4afcabaf8b03f4e2b6ae Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Thu, 28 Jan 2021 13:37:03 +0900 Subject: 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 --- StubLibraries.bp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'StubLibraries.bp') diff --git a/StubLibraries.bp b/StubLibraries.bp index 6cece60c484c..d8661169526c 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -57,6 +57,9 @@ stubs_defaults { aidl: { local_include_dirs: [ "apex/media/aidl/stable", + // TODO: move to include-dirs for packages/modules/Connectivity when this moves out of + // frameworks/base + "packages/Connectivity/framework/aidl-export", "telephony/java", ], }, @@ -306,6 +309,7 @@ java_library_static { "android.net.ipsec.ike.stubs", "art.module.public.api.stubs", "conscrypt.module.public.api.stubs", + "framework-connectivity.stubs", "framework-media.stubs", "framework-mediaprovider.stubs", "framework-permission.stubs", @@ -326,6 +330,7 @@ java_library_static { "android.net.ipsec.ike.stubs.system", "art.module.public.api.stubs", "conscrypt.module.public.api.stubs", + "framework-connectivity.stubs.system", "framework-media.stubs.system", "framework-mediaprovider.stubs.system", "framework-permission.stubs.system", @@ -362,6 +367,7 @@ java_library_static { "android.net.ipsec.ike.stubs.system", "art.module.public.api.stubs", "conscrypt.module.public.api.stubs", + "framework-connectivity.stubs.system", "framework-media.stubs.system", "framework-mediaprovider.stubs.system", "framework-permission.stubs.system", -- cgit v1.2.3