diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
| commit | f2477e01787aa58f445919b809d89e252beef54f (patch) | |
| tree | 2db962b4af39f0db3a5f83b314373d0530c484b8 /media/player_android.target.linux-arm.mk | |
| parent | 7daea1dd5ff7e419322de831b642d81af3247912 (diff) | |
| download | chromium_org-f2477e01787aa58f445919b809d89e252beef54f.tar.gz | |
Merge from Chromium at DEPS revision 237746
This commit was generated by merge_to_master.py.
Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
Diffstat (limited to 'media/player_android.target.linux-arm.mk')
| -rw-r--r-- | media/player_android.target.linux-arm.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/player_android.target.linux-arm.mk b/media/player_android.target.linux-arm.mk index d39c4289b9..c464112f63 100644 --- a/media/player_android.target.linux-arm.mk +++ b/media/player_android.target.linux-arm.mk @@ -86,6 +86,7 @@ MY_DEFS_Debug := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_MANAGED_USERS=1' \ '-DMEDIA_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-D__STDC_CONSTANT_MACROS' \ @@ -109,6 +110,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ $(gyp_shared_intermediate_dir)/ui/gl \ $(LOCAL_PATH)/third_party/mesa/src/include \ $(PWD)/frameworks/wilhelm/include \ @@ -176,6 +178,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_MANAGED_USERS=1' \ '-DMEDIA_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-D__STDC_CONSTANT_MACROS' \ @@ -200,6 +203,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ $(gyp_shared_intermediate_dir)/ui/gl \ $(LOCAL_PATH)/third_party/mesa/src/include \ $(PWD)/frameworks/wilhelm/include \ |