aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-02-23 04:24:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-02-23 04:24:32 +0000
commitf0d7383f81c0aa423c3761f82821535fc70f3075 (patch)
treed20f5e00f7d9548a299eb9624610ba1cee8a2875
parent98a853a7e56943b3d797eb931f80fc2018b8bc63 (diff)
parent78c36d0ea7bd04a737bd58dda1d335505b52f583 (diff)
downloadfreetype-f0d7383f81c0aa423c3761f82821535fc70f3075.tar.gz
Merge "Mark libft2 as non-LLNDK" into main am: 78c36d0ea7
Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2873454 Change-Id: I0ff4cf5b3b65766bec43eb3a0b1ce7a7ef6b0087 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp6
1 files changed, 1 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index cf537cb33..242ca9c61 100644
--- a/Android.bp
+++ b/Android.bp
@@ -115,6 +115,7 @@ cc_defaults {
cc_library {
name: "libft2",
defaults: ["libft2_defaults"],
+ vendor_available: true,
cflags: [
// Usually these are defined in include/freetype/config/ftoption.h
@@ -151,11 +152,6 @@ cc_library {
enabled: true,
},
},
-
- llndk: {
- private: true,
- symbol_file: "libft2.map.txt",
- },
}
// variant of libft2 without any library dependencies.