aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-02-09 17:02:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-09 17:02:11 +0000
commite80f85fa2d6bdc346f07adf3654dc11842e75af3 (patch)
tree898ebf0589e6fd5f2d2fc93cea23b74117bb56ea
parent94294f4fd8326561123a31fa2de1ef14d8b55db5 (diff)
parent6f213e4a5f9848b38b349b1e5ff3bb05e72a5aee (diff)
downloadselinux-e80f85fa2d6bdc346f07adf3654dc11842e75af3.tar.gz
Merge "Symbol files describing APIs across updatable components are reviewed" am: 6275ba5a60 am: 855120544e am: 843b56a0d6 am: 6f213e4a5f
Original change: https://android-review.googlesource.com/c/platform/external/selinux/+/1574784 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6906b0905e56da1b72f550280987d2444708767b
-rw-r--r--libselinux/Android.bp8
-rw-r--r--libselinux/exported.map.txt (renamed from libselinux/exported.map)0
2 files changed, 4 insertions, 4 deletions
diff --git a/libselinux/Android.bp b/libselinux/Android.bp
index dbd584f1..aa3e2d50 100644
--- a/libselinux/Android.bp
+++ b/libselinux/Android.bp
@@ -216,7 +216,7 @@ cc_library {
shared_libs: ["libpackagelistparser"],
},
- version_script: "exported.map",
+ version_script: "exported.map.txt",
},
vendor: {
@@ -241,7 +241,7 @@ cc_library {
},
stubs: {
- symbol_file: "exported.map",
+ symbol_file: "exported.map.txt",
versions: ["30"],
},
}
@@ -249,7 +249,7 @@ cc_library {
llndk_library {
name: "libselinux.llndk",
export_include_dirs: ["include"],
- symbol_file: "exported.map",
+ symbol_file: "exported.map.txt",
}
cc_binary_host {
@@ -272,7 +272,7 @@ rust_bindgen {
source_stem: "bindings",
local_include_dirs: ["include"],
- // Generate bindings only for the symbols that are actually exported (see exported.map).
+ // Generate bindings only for the symbols that are actually exported (see exported.map.txt).
// This makes the generated bindings much more concise and improves compilation
// time.
bindgen_flags: [
diff --git a/libselinux/exported.map b/libselinux/exported.map.txt
index ac701abd..ac701abd 100644
--- a/libselinux/exported.map
+++ b/libselinux/exported.map.txt