diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-19 16:13:49 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-09-19 16:13:49 -0700 |
| commit | 8ab25d82b56c7604dc945e4385b74a75de093e56 (patch) | |
| tree | 7f112dd6a95cacfc2f6322f06f346162820ed23f /libs/hwui | |
| parent | 0e3b5a7986a7304c2239d35796a60e59b8076c55 (diff) | |
| parent | 1a4527ce9449d913e7a60dc3784520006d8955b7 (diff) | |
| download | frameworks_base-8ab25d82b56c7604dc945e4385b74a75de093e56.zip frameworks_base-8ab25d82b56c7604dc945e4385b74a75de093e56.tar.gz frameworks_base-8ab25d82b56c7604dc945e4385b74a75de093e56.tar.bz2 | |
resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp
Change-Id: If649bd9ef98181a1e1e341cc5b73d237586fb72c
Diffstat (limited to 'libs/hwui')
| -rw-r--r-- | libs/hwui/Android.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk index 49560ff..36185ae 100644 --- a/libs/hwui/Android.mk +++ b/libs/hwui/Android.mk @@ -1,5 +1,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk # Only build libhwui when USE_OPENGL_RENDERER is # defined in the current device/board configuration @@ -82,15 +83,14 @@ 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 LOCAL_C_INCLUDES += \ $(intermediates) \ frameworks/rs/cpp \ - frameworks/rs + frameworks/rs \ + endif ifndef HWUI_COMPILE_SYMBOLS @@ -104,6 +104,7 @@ ifeq ($(USE_OPENGL_RENDERER),true) # Defaults for ATRACE_TAG and LOG_TAG for libhwui LOCAL_CFLAGS += -DATRACE_TAG=ATRACE_TAG_VIEW -DLOG_TAG=\"OpenGLRenderer\" + include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) include $(call all-makefiles-under,$(LOCAL_PATH)) |