summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hackmann2015-03-17 11:43:20 -0500
committerGerrit Code Review2015-03-17 11:43:21 -0500
commit92564d6e58b7a1a18cb5d7bf22393dba6dfe4356 (patch)
treec5077fda309c34356f1cb72c1b1f2d617435f302
parent221fe8037f9f4461854c56f9e05b44ce74435889 (diff)
parent593b592e93b7793cdbded9e1e77f723a1f91f866 (diff)
downloadplatform-system-core-92564d6e58b7a1a18cb5d7bf22393dba6dfe4356.tar.gz
platform-system-core-92564d6e58b7a1a18cb5d7bf22393dba6dfe4356.tar.xz
platform-system-core-92564d6e58b7a1a18cb5d7bf22393dba6dfe4356.zip
Merge "pixelflinger: don't build static library"
-rw-r--r--libpixelflinger/Android.mk18
1 files changed, 0 insertions, 18 deletions
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk
index acd18b026..aa614bc17 100644
--- a/libpixelflinger/Android.mk
+++ b/libpixelflinger/Android.mk
@@ -74,22 +74,4 @@ LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
74LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as 74LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
75include $(BUILD_SHARED_LIBRARY) 75include $(BUILD_SHARED_LIBRARY)
76 76
77#
78# Static library version
79#
80
81include $(CLEAR_VARS)
82LOCAL_MODULE:= libpixelflinger_static
83LOCAL_SRC_FILES := $(PIXELFLINGER_SRC_FILES)
84LOCAL_SRC_FILES_arm := $(PIXELFLINGER_SRC_FILES_arm)
85LOCAL_SRC_FILES_arm64 := $(PIXELFLINGER_SRC_FILES_arm64)
86LOCAL_SRC_FILES_mips := $(PIXELFLINGER_SRC_FILES_mips)
87LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS)
88# t32cb16blend.S does not compile with Clang.
89LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
90# arch-arm64/col32cb16blend.S does not compile with Clang.
91LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
92include $(BUILD_STATIC_LIBRARY)
93
94
95include $(call all-makefiles-under,$(LOCAL_PATH)) 77include $(call all-makefiles-under,$(LOCAL_PATH))