commit 8160c6e8dfaebae55d2e0f6af323684fed1cc5d1
author android-build-team Robot <android-build-team-robot@google.com> Sat Apr 24 03:02:59 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Apr 24 03:02:59 2021 +0000
tree 4932869f24580e9f7305224676711b487f60063a
parent 2d7b0e45bac399eda7ffac5c67d383512fb06e1d
parent f9102744be779483675fbc5318be131c3d0284ed

Snap for 7310088 from f9102744be779483675fbc5318be131c3d0284ed to sc-release

Change-Id: I24979a74a7fe8aa4f4c34a28640ea863f24dd0ce

Android.bp

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.