diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-06-16 14:50:38 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-06-16 14:50:38 +0000 |
| commit | b68b69450259b5e317e989b0331c1ac97af9bb9c (patch) | |
| tree | 2a407107c8d7dceeaac518b3db0daa127b347224 /libvpx_obj_int_extract.host.linux-x86.mk | |
| parent | f1a314b2eb3a83facfd86d292b05f37d77381cac (diff) | |
| download | libvpx-b68b69450259b5e317e989b0331c1ac97af9bb9c.tar.gz | |
Update makefiles after merge of Chromium at 277428
This commit was generated by merge_from_chromium.py.
Change-Id: I3eadc487610f49439fcb469b3b7c438b0a388aae
Diffstat (limited to 'libvpx_obj_int_extract.host.linux-x86.mk')
| -rw-r--r-- | libvpx_obj_int_extract.host.linux-x86.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libvpx_obj_int_extract.host.linux-x86.mk b/libvpx_obj_int_extract.host.linux-x86.mk index 6d690e9..9f10297 100644 --- a/libvpx_obj_int_extract.host.linux-x86.mk +++ b/libvpx_obj_int_extract.host.linux-x86.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \ $(LOCAL_PATH)/third_party/libvpx/source/config \ $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ @@ -150,6 +151,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \ $(LOCAL_PATH)/third_party/libvpx/source/config \ $(LOCAL_PATH)/third_party/libvpx/source/libvpx \ |