diff options
author | Colin Cross <ccross@android.com> | 2021-04-23 00:41:44 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-23 00:41:44 +0000 |
commit | f9102744be779483675fbc5318be131c3d0284ed (patch) | |
tree | 4932869f24580e9f7305224676711b487f60063a | |
parent | cda5f9fc12593bea97702c9c9565f6469f45743f (diff) | |
parent | 2e525035c561dd013d7c1311d20d699756cd3210 (diff) | |
download | freetype-android12-qpr3-s4-release.tar.gz |
Merge "Replace llndk_library with llndk clause in cc_library" am: 59719b5837 am: 207bbdaa8e am: 2e525035c5android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/1624906
Change-Id: I1a720df10cba5b3c0b7a27e4d4bd50b2506df582
-rw-r--r-- | Android.bp | 12 |
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. |