Skip to content

Commit

Permalink
pixelflinger: Fix local src arch includes
Browse files Browse the repository at this point in the history
Automatic handling of LOCAL_SRC_FILES_(ARCH) was introduced in Android
5.0. Lower the SDK version check so these source files don't get
doubly included.

Change-Id: I8ebc7e3e687f2805f6ecb56499cbf39fc31e9545
Reference: see build/core/binary.mk and the handling of my_src_files
  • Loading branch information
mdmower authored and Dees-Troy committed Dec 22, 2015
1 parent 231daef commit 9a5b8b7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion libpixelflinger/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ LOCAL_SRC_FILES_arm := $(PIXELFLINGER_SRC_FILES_arm)
LOCAL_SRC_FILES_arm64 := $(PIXELFLINGER_SRC_FILES_arm64)
LOCAL_SRC_FILES_x86 := $(PIXELFLINGER_SRC_FILES_x86)
LOCAL_SRC_FILES_mips := $(PIXELFLINGER_SRC_FILES_mips)
ifneq ($(shell test $(PLATFORM_SDK_VERSION) -gt 22; echo $$?),0)
ifneq ($(shell test $(PLATFORM_SDK_VERSION) -gt 20; echo $$?),0)
LOCAL_SRC_FILES += $(LOCAL_SRC_FILES_$(TARGET_ARCH))
endif
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
Expand Down

0 comments on commit 9a5b8b7

Please sign in to comment.