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

Commit 982e28ca authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Cleanup"

parents b3d5856e ce444ca4

libs/hwui/Android.mk

+4 −7
Original line number Diff line number Diff line
@@ -71,8 +71,6 @@ ifeq ($(USE_OPENGL_RENDERER),true) 
		$(LOCAL_PATH)/../../include/utils \

		external/skia/src/core



	include external/stlport/libstlport.mk



	LOCAL_CFLAGS += -DUSE_OPENGL_RENDERER -DEGL_EGLEXT_PROTOTYPES -DGL_GLEXT_PROTOTYPES

	LOCAL_CFLAGS += -Wno-unused-parameter

	LOCAL_MODULE_CLASS := SHARED_LIBRARIES
@@ -80,16 +78,15 @@ ifeq ($(USE_OPENGL_RENDERER),true) 
	LOCAL_MODULE := libhwui

	LOCAL_MODULE_TAGS := optional



	include external/stlport/libstlport.mk



	ifneq (false,$(ANDROID_ENABLE_RENDERSCRIPT))

		LOCAL_CFLAGS += -DANDROID_ENABLE_RENDERSCRIPT

		LOCAL_SHARED_LIBRARIES += libRS libRScpp libstlport

		LOCAL_SHARED_LIBRARIES += libRS libRScpp

		LOCAL_C_INCLUDES += \

			$(intermediates) \

			frameworks/rs/cpp \

			frameworks/rs \

			external/stlport/stlport \

			bionic/ \

			bionic/libstdc++/include

			frameworks/rs

	endif



	ifndef HWUI_COMPILE_SYMBOLS

libs/hwui/DisplayListOp.h

+7 −7

File changed.

Contains only whitespace changes.