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

Commit 8020313d authored Jan 20, 2016 by John Reck Committed by Android (Google) Code Review Jan 20, 2016

Merge "Re-enable new pipeline"

parents 8bcbb9bc dcdbba7c

core/jni/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@ LOCAL_CFLAGS += -U__APPLE__
		LOCAL_CFLAGS += -Wno-unused-parameter
		LOCAL_CFLAGS += -Wno-non-virtual-dtor
		LOCAL_CFLAGS += -Wno-maybe-uninitialized -Wno-parentheses
		LOCAL_CFLAGS += -DHWUI_NEW_OPS
		LOCAL_CPPFLAGS += -Wno-conversion-null

		ifeq ($(TARGET_ARCH), arm)

libs/hwui/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)
		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		HWUI_NEW_OPS := false
		HWUI_NEW_OPS := true

		hwui_src_files := \
		font/CacheTexture.cpp \