diff options
| author | 2016-01-13 01:13:32 +0000 | |
|---|---|---|
| committer | 2016-01-13 01:13:32 +0000 | |
| commit | 477e26cf931290f6b3353fab43a05406eea223f9 (patch) | |
| tree | a78908ff73553b3253fb36787e6ec83ebccb88f7 | |
| parent | 96eb366db9476627da75b1786a84a99c73ac301b (diff) | |
| parent | 3daf4d3272f2cc6ce3b5a572b9d4dcce1654086d (diff) | |
Merge "Switch to new rendering pipeline"
| -rw-r--r-- | core/jni/Android.mk | 1 | ||||
| -rw-r--r-- | libs/hwui/Android.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 30593f2eb67e..fc1ba4439443 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 44c5e2f35f6e..86368f057346 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 \ |