Merge "Replace llndk_library with llndk clause in cc_library" am: 59719b5837 am: 207bbdaa8e am: 2e525035c5 am: f9102744beandroid-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release

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

Change-Id: Id98904cba55d4bbf75a7a61e61724e837e686e25

1 files changed, 4 insertions, 8 deletions

diff --git a/Android.bp b/Android.bp
index 1ba04a22a..127d6e6a3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -100,8 +100,6 @@ cc_library {
     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 @@ cc_library {
             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.