From 61ab160de819b2c77da1a89ce882edb271c9c7cd Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 9 Mar 2021 16:01:26 -0800
Subject: [PATCH] Replace llndk_library with llndk clause in cc_library

Remove the vestigial llndk_library and replace it with properties
in the llndk clause of the implementation cc_library.

Bug: 170784825
Test: m checkbuild
Test: compare out/soong/build.ninja
Change-Id: Iba6172b001460f1902f511a46a62439289b7e15b
---
 Android.bp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/Android.bp b/Android.bp
index c042a3bf1..bfdd8561d 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.