summaryrefslogtreecommitdiffstats
path: root/libpixelflinger
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2015-03-12 13:03:08 -0700
committerGreg Hackmann <ghackmann@google.com>2015-03-12 13:07:59 -0700
commit593b592e93b7793cdbded9e1e77f723a1f91f866 (patch)
tree6bd841c2160d2aef449d16497bce31101679345e /libpixelflinger
parent56350fe387e77824a1e360d39a22f983b0a8ab20 (diff)
downloadcore-593b592e93b7793cdbded9e1e77f723a1f91f866.tar.gz
core-593b592e93b7793cdbded9e1e77f723a1f91f866.tar.bz2
core-593b592e93b7793cdbded9e1e77f723a1f91f866.zip
pixelflinger: don't build static library
libagl is now the only remaining pixelflinger client in the Android tree, and it links with pixelflinger dynamically. Change-Id: Ic5f8af57a88ceaeb25bf890cd6be8bc5a893fc10 Signed-off-by: Greg Hackmann <ghackmann@google.com>
Diffstat (limited to 'libpixelflinger')
-rw-r--r--libpixelflinger/Android.mk18
1 files changed, 0 insertions, 18 deletions
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk
index 128863dd4..697db25e1 100644
--- a/libpixelflinger/Android.mk
+++ b/libpixelflinger/Android.mk
@@ -76,22 +76,4 @@ LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
include $(BUILD_SHARED_LIBRARY)
-#
-# Static library version
-#
-
-include $(CLEAR_VARS)
-LOCAL_MODULE:= libpixelflinger_static
-LOCAL_SRC_FILES := $(PIXELFLINGER_SRC_FILES)
-LOCAL_SRC_FILES_arm := $(PIXELFLINGER_SRC_FILES_arm)
-LOCAL_SRC_FILES_arm64 := $(PIXELFLINGER_SRC_FILES_arm64)
-LOCAL_SRC_FILES_mips := $(PIXELFLINGER_SRC_FILES_mips)
-LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS)
-# t32cb16blend.S does not compile with Clang.
-LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
-# arch-arm64/col32cb16blend.S does not compile with Clang.
-LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
-include $(BUILD_STATIC_LIBRARY)
-
-
include $(call all-makefiles-under,$(LOCAL_PATH))