diff options
| author | 2024-01-10 14:41:30 -0800 | |
|---|---|---|
| committer | 2024-01-10 23:25:10 +0000 | |
| commit | f5522cb0be250f28bf5c77b7c847b721c76ea901 (patch) | |
| tree | b2acc707a2df2a3966447e7026f4dd7dc28b881d | |
| parent | cd640da7fa9e74acffa3aa633efad27db1433d6d (diff) | |
Seprate the aconfig library for framework and other usage
To avoid wrongly access the fake_device_config
Bug: 301173764
Test: build
Change-Id: Ifc1768875dcf55b9edf3bc7ad74e71c1b23c0275
| -rw-r--r-- | flags/Android.bp | 9 | ||||
| -rw-r--r-- | framework/Android.bp | 2 | ||||
| -rw-r--r-- | service/Android.bp | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/flags/Android.bp b/flags/Android.bp index 5333801cdb..0caa6d59e5 100644 --- a/flags/Android.bp +++ b/flags/Android.bp @@ -28,7 +28,6 @@ java_aconfig_library { name: "wifi_aconfig_flags_lib", aconfig_declarations: "wifi_aconfig_flags", min_sdk_version: "30", - defaults: ["wifi-framework-aconfig-java-defaults"], apex_available: [ "//apex_available:platform", "com.android.wifi", @@ -40,8 +39,14 @@ java_aconfig_library { ], } +java_aconfig_library { + name: "wifi_framework_aconfig_flags_lib", + aconfig_declarations: "wifi_aconfig_flags", + defaults: ["wifi-framework-aconfig-java-defaults"], +} + java_defaults { name: "wifi-framework-aconfig-java-defaults", sdk_version: "core_platform", libs: ["fake_device_config"], -}
\ No newline at end of file +} diff --git a/framework/Android.bp b/framework/Android.bp index c05ff69eb8..8ed00e8fed 100644 --- a/framework/Android.bp +++ b/framework/Android.bp @@ -44,7 +44,7 @@ filegroup { ":framework-wifi-updatable-java-sources", ":framework-wifi-updatable-exported-aidl-sources", ":module-utils-os-aidls", - ":wifi_aconfig_flags_lib{.generated_srcjars}", + ":wifi_framework_aconfig_flags_lib{.generated_srcjars}", ], } diff --git a/service/Android.bp b/service/Android.bp index 22662f4c36..9ad0da0dab 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -121,7 +121,6 @@ java_library { "service-entitlement", "wifi-lite-protos", "wifi-nano-protos", - "wifi_aconfig_flags_lib", ], } |