aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <luchris@google.com>2024-02-23 09:48:47 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-02-23 09:48:47 +0000
commitfb709993be9d12149b8cf782f084bb44349926bd (patch)
treeae363805e8be7812ad3a88ff8f28cd1380d7ac92
parentf0d7383f81c0aa423c3761f82821535fc70f3075 (diff)
parent3e941abfdcb77b18c47932abc0da2903ef064c9a (diff)
downloadfreetype-master.tar.gz
Merge "Revert "Mark libft2 as non-LLNDK"" into main am: 3e941abfdcHEADmastermain
Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2975252 Change-Id: I2469d70b62725f7189f73c7476f0bde40f63fce7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp6
1 files changed, 5 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 242ca9c61..cf537cb33 100644
--- a/Android.bp
+++ b/Android.bp
@@ -115,7 +115,6 @@ cc_defaults {
cc_library {
name: "libft2",
defaults: ["libft2_defaults"],
- vendor_available: true,
cflags: [
// Usually these are defined in include/freetype/config/ftoption.h
@@ -152,6 +151,11 @@ cc_library {
enabled: true,
},
},
+
+ llndk: {
+ private: true,
+ symbol_file: "libft2.map.txt",
+ },
}
// variant of libft2 without any library dependencies.