diff options
| author | Narayan Kamath <narayan@google.com> | 2015-09-10 22:00:26 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-09-10 22:00:26 +0100 |
| commit | a82d6dc3bf18b74aab4e8fb497b08e02f4a1ec8d (patch) | |
| tree | 71b01bdd7c260fb401054a68c0f9776d28a2a6d2 /libpixelflinger/Android.mk | |
| parent | 3fe4051430be1da4c1f119c165a4bb8b3a9dd499 (diff) | |
| parent | b638126ed3c704ac65024597af952fd45e165410 (diff) | |
| download | system_core-a82d6dc3bf18b74aab4e8fb497b08e02f4a1ec8d.zip system_core-a82d6dc3bf18b74aab4e8fb497b08e02f4a1ec8d.tar.gz system_core-a82d6dc3bf18b74aab4e8fb497b08e02f4a1ec8d.tar.bz2 | |
resolved conflicts for b638126e to klp-modular-dev
Change-Id: If5062b01afa95279ab25fe86aaafa89d4d74eaa1
Diffstat (limited to 'libpixelflinger/Android.mk')
| -rw-r--r-- | libpixelflinger/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk index fe50cc6..fb8478c 100644 --- a/libpixelflinger/Android.mk +++ b/libpixelflinger/Android.mk @@ -14,8 +14,6 @@ PIXELFLINGER_SRC_FILES:= \ codeflinger/load_store.cpp \ codeflinger/blending.cpp \ codeflinger/texturing.cpp \ - codeflinger/tinyutils/SharedBuffer.cpp \ - codeflinger/tinyutils/VectorImpl.cpp \ fixed.cpp.arm \ picker.cpp.arm \ pixelflinger.cpp.arm \ @@ -67,6 +65,8 @@ endif LOCAL_MODULE:= libpixelflinger LOCAL_SRC_FILES := $(PIXELFLINGER_SRC_FILES) LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS) +LOCAL_C_INCLUDES += external/safe-iop/include +LOCAL_SHARED_LIBRARIES := libcutils liblog libutils ifneq ($(BUILD_TINY_ANDROID),true) # Really this should go away entirely or at least not depend on |