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

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

Merge "Revert "Switch to new rendering pipeline""

parents f3c5834c 1b94f9b7

core/jni/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 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

+2 −2
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 := true

HWUI_NEW_OPS := false



hwui_src_files := \

    font/CacheTexture.cpp \
@@ -233,7 +233,6 @@ LOCAL_SRC_FILES += \ 
    tests/unit/GpuMemoryTrackerTests.cpp \

    tests/unit/LayerUpdateQueueTests.cpp \

    tests/unit/LinearAllocatorTests.cpp \

    tests/unit/LeakCheckTests.cpp \

    tests/unit/VectorDrawableTests.cpp \

    tests/unit/OffscreenBufferPoolTests.cpp \

    tests/unit/StringUtilsTests.cpp
@@ -242,6 +241,7 @@ ifeq (true, $(HWUI_NEW_OPS)) 
    LOCAL_SRC_FILES += \

        tests/unit/BakedOpStateTests.cpp \

        tests/unit/FrameBuilderTests.cpp \

        tests/unit/LeakCheckTests.cpp \

        tests/unit/RecordingCanvasTests.cpp

endif