Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0af1ac13 authored by Xing's avatar Xing Committed by Dees Troy
Browse files

do not include stlport headers unless link to it 

Change-Id: I8344d270ddb601694b5fef0fa7b22ea437030728
parent 4251a9bc

Android.mk

+5 −2
Original line number Diff line number Diff line
@@ -100,7 +100,10 @@ LOCAL_C_INCLUDES += \ 
    system/extras/ext4_utils \

    system/core/adb \



LOCAL_C_INCLUDES += bionic external/stlport/stlport external/openssl/include $(LOCAL_PATH)/libmincrypt/includes

LOCAL_C_INCLUDES += bionic external/openssl/include $(LOCAL_PATH)/libmincrypt/includes

ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0)

    LOCAL_C_INCLUDES += external/stlport/stlport

endif



LOCAL_STATIC_LIBRARIES :=

LOCAL_SHARED_LIBRARIES :=
@@ -109,7 +112,7 @@ LOCAL_STATIC_LIBRARIES += libguitwrp 
LOCAL_SHARED_LIBRARIES += libz libc libcutils libstdc++ libtar libblkid libminuitwrp libminadbd libmtdutils libminzip libaosprecovery

LOCAL_SHARED_LIBRARIES += libcrecovery



ifeq (,$(filter $(PLATFORM_SDK_VERSION), 23))

ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0)

    LOCAL_SHARED_LIBRARIES += libstlport

else

    LOCAL_SHARED_LIBRARIES += libc++

gui/Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -70,7 +70,11 @@ ifeq ($(TW_ROUND_SCREEN), true) 
    LOCAL_CFLAGS += -DTW_ROUND_SCREEN

endif



LOCAL_C_INCLUDES += bionic external/stlport/stlport system/core/libpixelflinger/include

LOCAL_C_INCLUDES += bionic system/core/libpixelflinger/include

ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0)

    LOCAL_C_INCLUDES += external/stlport/stlport

endif



LOCAL_CFLAGS += -DTWRES=\"$(TWRES_PATH)\"



include $(BUILD_STATIC_LIBRARY)

mtp/Android.mk

+6 −2
Original line number Diff line number Diff line
@@ -7,7 +7,11 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := libtwrpmtp

LOCAL_MODULE_TAGS := optional

LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 -DMTP_DEVICE -DMTP_HOST -fno-strict-aliasing

LOCAL_C_INCLUDES += $(LOCAL_PATH) bionic external/stlport/stlport frameworks/base/include system/core/include bionic/libc/private/

LOCAL_C_INCLUDES += $(LOCAL_PATH) bionic frameworks/base/include system/core/include bionic/libc/private/

ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0)

    LOCAL_C_INCLUDES += external/stlport/stlport

endif



LOCAL_SRC_FILES = \

    btree.cpp \

    MtpDataPacket.cpp \
@@ -31,7 +35,7 @@ LOCAL_SRC_FILES = \ 
    node.cpp

LOCAL_SHARED_LIBRARIES += libz libc libusbhost libstdc++ libdl libcutils libutils libaosprecovery



ifeq (,$(filter $(PLATFORM_SDK_VERSION), 23))

ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0)

    LOCAL_SHARED_LIBRARIES += libstlport

else

    LOCAL_SHARED_LIBRARIES += libc++

twrpTarMain/Android.mk

+9 −2
Original line number Diff line number Diff line
@@ -11,8 +11,15 @@ LOCAL_SRC_FILES:= \ 
	../twrpDU.cpp

LOCAL_CFLAGS:= -g -c -W -DBUILD_TWRPTAR_MAIN



LOCAL_C_INCLUDES += bionic external/stlport/stlport

LOCAL_STATIC_LIBRARIES := libc libtar_static libstlport_static libstdc++

LOCAL_C_INCLUDES += bionic

ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0)

    LOCAL_C_INCLUDES += external/stlport/stlport

endif



LOCAL_STATIC_LIBRARIES := libc libtar_static libstdc++

ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0)

    LOCAL_STATIC_LIBRARIES += libstlport_static

endif



ifeq ($(TWHAVE_SELINUX), true)

    LOCAL_C_INCLUDES += external/libselinux/include