diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-25 10:06:34 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-25 10:06:34 +0100 |
| commit | bbcdd45c55eb7c4641ab97aef9889b0fc828e7d3 (patch) | |
| tree | 51387d1614b16fcf107004649d44707d271da339 /media/player_android.target.linux-mips.mk | |
| parent | 8a142c18176c4e279012cb218f060cfc3df087c5 (diff) | |
| download | chromium_org-bbcdd45c55eb7c4641ab97aef9889b0fc828e7d3.tar.gz | |
Merge from Chromium at DEPS revision r213605
This commit was generated by merge_to_master.py.
Change-Id: I5ef9e03bf077dac295a7904f06b3cb6dec9fe213
Diffstat (limited to 'media/player_android.target.linux-mips.mk')
| -rw-r--r-- | media/player_android.target.linux-mips.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/media/player_android.target.linux-mips.mk b/media/player_android.target.linux-mips.mk index 4fe58d04dc..cbca452a60 100644 --- a/media/player_android.target.linux-mips.mk +++ b/media/player_android.target.linux-mips.mk @@ -97,12 +97,12 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ - $(gyp_shared_intermediate_dir)/media \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(gyp_shared_intermediate_dir)/media \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(gyp_shared_intermediate_dir)/ui/gl \ $(LOCAL_PATH)/third_party/mesa/src/include \ @@ -186,12 +186,12 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ - $(gyp_shared_intermediate_dir)/media \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(gyp_shared_intermediate_dir)/media \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(gyp_shared_intermediate_dir)/ui/gl \ $(LOCAL_PATH)/third_party/mesa/src/include \ |