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

Commit 449a283d authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "fix moar qcom pollution" into jellybean

parents 7acd6ed1 1fbeba2b

core/jni/Android.mk

+5 −2
Original line number Diff line number Diff line
@@ -162,13 +162,16 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true) 
    LOCAL_CFLAGS += -DQCOM_HARDWARE

    LOCAL_SRC_FILES += \

	    com_android_internal_app_ActivityTrigger.cpp

    LOCAL_C_INCLUDES += \

	    hardware/qcom/display/libtilerenderer

    LOCAL_SHARED_LIBRARIES += \

	    libtilerenderer

endif



LOCAL_C_INCLUDES += \

	$(JNI_H_INCLUDE) \

	$(LOCAL_PATH)/android/graphics \

	$(LOCAL_PATH)/../../libs/hwui \

	hardware/qcom/display/libtilerenderer \

	$(LOCAL_PATH)/../../../native/opengl/libs \

	$(call include-path-for, bluedroid) \

	$(call include-path-for, libhardware)/hardware \
@@ -227,7 +230,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libz



ifeq ($(USE_OPENGL_RENDERER),true)

	LOCAL_SHARED_LIBRARIES += libtilerenderer libhwui

	LOCAL_SHARED_LIBRARIES += libhwui

endif



ifeq ($(BOARD_HAVE_BLUETOOTH),true)

libs/hwui/Android.mk

+4 −1
Original line number Diff line number Diff line
@@ -51,7 +51,10 @@ endif 
	LOCAL_CFLAGS += -DUSE_OPENGL_RENDERER -DGL_GLEXT_PROTOTYPES

	LOCAL_CFLAGS += -fvisibility=hidden

	LOCAL_MODULE_CLASS := SHARED_LIBRARIES

	LOCAL_SHARED_LIBRARIES := libcutils libutils libGLESv2 libskia libui libtilerenderer

	LOCAL_SHARED_LIBRARIES := libcutils libutils libGLESv2 libskia libui

ifeq ($(BOARD_USES_QCOM_HARDWARE),true)

	LOCAL_SHARED_LIBRARIES += libtilerenderer

endif

	LOCAL_MODULE := libhwui

	LOCAL_MODULE_TAGS := optional