Merge AOSP android-9.0.0_r3
Fix conflicts and make it build in 5.1, 6.0, 7.1, 8.1, and 9.0 Change-Id: Ida0a64c29ff27d339b7f42a18d820930964ac6e4
This commit is contained in:
@@ -104,6 +104,7 @@ endif
|
||||
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
|
||||
LOCAL_C_INCLUDES += $(LOCAL_EXPORT_C_INCLUDE_DIRS)
|
||||
LOCAL_CFLAGS := $(PIXELFLINGER_CFLAGS)
|
||||
LOCAL_CPPFLAGS := -Wno-unused-function
|
||||
LOCAL_C_INCLUDES_x86 := $(PIXELFLINGER_C_INCLUDES_x86)
|
||||
ifeq ($(TW_HAVE_X86_ACCELERATED_PIXELFLINGER),true)
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES += libenc
|
||||
|
||||
Reference in New Issue
Block a user