| commit | 21ec10e26f661081e10ee89765d005cd31939c2b | [log] [tgz] |
|---|---|---|
| author | Nick Bray <ncbray@google.com> | Thu Jun 03 23:01:19 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 03 23:01:19 2021 +0000 |
| tree | 5ff7767623a6d8bf30a7033da929902cfd65062f | |
| parent | f9102744be779483675fbc5318be131c3d0284ed [diff] | |
| parent | 1b10e81f4531d79207c92b15fdcd02a7a3d5fccf [diff] |
Merge "[trusty] Add teeui to library build system" am: 7e685b031d am: 1b10e81f45 Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/1535351 Change-Id: Ifcfd79a34efb5b958259f3d69ac364db1e935fbc
diff --git a/devel-teeui/rules.mk b/devel-teeui/rules.mk index 864a286..b834ce7 100644 --- a/devel-teeui/rules.mk +++ b/devel-teeui/rules.mk
@@ -19,14 +19,14 @@ $(FREETYPE_ROOT)/src/autofit/autofit.c \ $(FREETYPE_ROOT)/src/gzip/ftgzip.c \ -GLOBAL_INCLUDES += \ +MODULE_EXPORT_INCLUDES += \ $(LOCAL_DIR) \ $(FREETYPE_ROOT)/include \ MODULE_COMPILEFLAGS := -U__ANDROID__ -DFT2_BUILD_LIBRARY MODULE_COMPILEFLAGS += -Wno-implicit-fallthrough -MODULE_DEPS += \ +MODULE_LIBRARY_DEPS += \ trusty/user/base/lib/libc-trusty \ -include make/module.mk +include make/library.mk