From 4ff7d4e678b06ebd10b2e84374828eeb851a5dfe Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 22 Apr 2021 16:44:24 -0700 Subject: Replace llndk_library with llndk clause in cc_library Remove the vestigial llndk_library and replace it with properties in the llndk clause of the implementation cc_library. Bug: 170784825 Test: m checkbuild Test: compare out/soong/build.ninja Change-Id: I960d7592fc71482e547f3617d0e55503c36cb63a --- native/android/Android.bp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'native') diff --git a/native/android/Android.bp b/native/android/Android.bp index 2a2b08d77e21..dda230d10137 100644 --- a/native/android/Android.bp +++ b/native/android/Android.bp @@ -115,7 +115,11 @@ cc_library_shared { cc_library_shared { name: "libandroid_net", defaults: ["libandroid_defaults"], - llndk_stubs: "libandroid_net.llndk", + llndk: { + symbol_file: "libandroid_net.map.txt", + unversioned: true, + override_export_include_dirs: ["include"], + }, srcs: ["net.c"], shared_libs: ["libnetd_client"], @@ -123,13 +127,6 @@ cc_library_shared { include_dirs: ["bionic/libc/dns/include"], } -llndk_library { - name: "libandroid_net.llndk", - export_include_dirs: ["include"], - symbol_file: "libandroid_net.map.txt", - unversioned: true, -} - // Aidl library for platform compat. cc_library_shared { name: "lib-platform-compat-native-api", -- cgit v1.2.3-59-g8ed1b