diff options
| author | Greg Hackmann <ghackmann@google.com> | 2015-03-17 16:43:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-17 16:43:21 +0000 |
| commit | 92564d6e58b7a1a18cb5d7bf22393dba6dfe4356 (patch) | |
| tree | c5077fda309c34356f1cb72c1b1f2d617435f302 /libpixelflinger/Android.mk | |
| parent | 221fe8037f9f4461854c56f9e05b44ce74435889 (diff) | |
| parent | 593b592e93b7793cdbded9e1e77f723a1f91f866 (diff) | |
| download | system_core-92564d6e58b7a1a18cb5d7bf22393dba6dfe4356.zip system_core-92564d6e58b7a1a18cb5d7bf22393dba6dfe4356.tar.gz system_core-92564d6e58b7a1a18cb5d7bf22393dba6dfe4356.tar.bz2 | |
Merge "pixelflinger: don't build static library"
Diffstat (limited to 'libpixelflinger/Android.mk')
| -rw-r--r-- | libpixelflinger/Android.mk | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk index acd18b0..aa614bc 100644 --- a/libpixelflinger/Android.mk +++ b/libpixelflinger/Android.mk @@ -74,22 +74,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)) |