Merge "Replace llndk_library with llndk clause in cc_library" am: 59719b5837 am: 207bbdaa8e

Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/1624906

Change-Id: I783530aea7fc107ab84e7e8d764a221d7f4e9151
diff --git a/Android.bp b/Android.bp
index 1ba04a2..127d6e6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -100,8 +100,6 @@
     name: "libft2",
     defaults: ["libft2_defaults"],
 
-    llndk_stubs: "libft2.llndk",
-
     cflags: [
         // Usually these are defined in include/freetype/config/ftoption.h
         // we have commented them and defined them here to allow for the
@@ -136,13 +134,11 @@
             enabled: true,
         },
     },
-}
 
-llndk_library {
-    name: "libft2.llndk",
-    private: true,
-    symbol_file: "libft2.map.txt",
-    export_include_dirs: ["include"],
+    llndk: {
+        private: true,
+        symbol_file: "libft2.map.txt",
+    },
 }
 
 // variant of libft2 without any library dependencies.