From dcdbba7c95c8495cf5b25b020b33af186e127bf2 Mon Sep 17 00:00:00 2001 From: John Reck Date: Tue, 19 Jan 2016 13:57:16 -0800 Subject: [PATCH] Re-enable new pipeline Change-Id: I0d0b2a109a3756d404e4e244348a863a9afa3f9b --- core/jni/Android.mk | 1 + libs/hwui/Android.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 30593f2eb67e8..fc1ba44394435 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -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) diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk index 1248a4c87cb33..8ba6318983fc9 100644 --- a/libs/hwui/Android.mk +++ b/libs/hwui/Android.mk @@ -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 \