diff options
| author | Colin Cross <ccross@android.com> | 2021-04-27 02:25:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-27 02:25:02 +0000 |
| commit | 875493dc1a5cfc88f9112208a6861000c3a480cb (patch) | |
| tree | b3f88f6129fe8085d3556bf16e0a191c173207aa /native | |
| parent | 9caa70a8d3d67469bcb1dd2b003c0a82ab04c58f (diff) | |
| parent | 5bc3c6ad4794ef24d6ecabf57029f640ca205bd7 (diff) | |
Merge "Replace llndk_library with llndk clause in cc_library" am: 9e9d7bd0bc am: f9abc183b4 am: 5bc3c6ad47
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684529
Change-Id: I78a0a42bdcec3338ec8f204c1a6a08158529995f
Diffstat (limited to 'native')
| -rw-r--r-- | native/android/Android.bp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/native/android/Android.bp b/native/android/Android.bp index 24c93ce63b1e..3ee2c18a0eab 100644 --- a/native/android/Android.bp +++ b/native/android/Android.bp @@ -127,7 +127,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"], @@ -135,13 +139,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", |