diff options
author | Colin Cross <ccross@android.com> | 2021-04-23 01:08:14 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-23 01:08:14 +0000 |
commit | f8938a05251ef87913311e331869f8ea900a0d68 (patch) | |
tree | 4932869f24580e9f7305224676711b487f60063a | |
parent | 69d767e000878e01a4f22af870e2eb9e8a895f32 (diff) | |
parent | f9102744be779483675fbc5318be131c3d0284ed (diff) | |
download | freetype-android12-mainline-art-release.tar.gz |
Merge "Replace llndk_library with llndk clause in cc_library" am: 59719b5837 am: 207bbdaa8e am: 2e525035c5 am: f9102744beandroid-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-release
Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/1624906
Change-Id: I020b17f4962e7ffe468e0094a40a07d12b31b1a4
-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. |