commit fb709993be9d12149b8cf782f084bb44349926bd
author Chris Lu <luchris@google.com> Fri Feb 23 09:48:47 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 23 09:48:47 2024 +0000
tree ae363805e8be7812ad3a88ff8f28cd1380d7ac92
parent f0d7383f81c0aa423c3761f82821535fc70f3075
parent 3e941abfdcb77b18c47932abc0da2903ef064c9a

Merge "Revert "Mark libft2 as non-LLNDK"" into main am: 3e941abfdc

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>

Android.bp

diff --git a/Android.bp b/Android.bp
index 242ca9c..cf537cb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -115,7 +115,6 @@
 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 @@
             enabled: true,
         },
     },
+
+    llndk: {
+        private: true,
+        symbol_file: "libft2.map.txt",
+    },
 }
 
 // variant of libft2 without any library dependencies.