diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-06-16 14:50:40 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-06-16 14:50:40 +0000 |
| commit | 756620019b8e754df4ff9d82ff09d65f6517ed88 (patch) | |
| tree | 8ca988d3c638a6e2bbadea905e07979db14e3551 | |
| parent | 298bb327984a8f4f4f3606ef6586958ce372e610 (diff) | |
| download | openmax_dl-756620019b8e754df4ff9d82ff09d65f6517ed88.tar.gz | |
Update makefiles after merge of Chromium at 277428
This commit was generated by merge_from_chromium.py.
Change-Id: I6d7e5a5958c290549729399c01cb745314c15f86
| -rw-r--r-- | dl/openmax_dl.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | dl/openmax_dl.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | dl/openmax_dl.target.darwin-x86_64.mk | 2 | ||||
| -rw-r--r-- | dl/openmax_dl.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | dl/openmax_dl.target.linux-x86.mk | 2 | ||||
| -rw-r--r-- | dl/openmax_dl.target.linux-x86_64.mk | 2 | ||||
| -rw-r--r-- | dl/openmax_dl_armv7.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | dl/openmax_dl_armv7.target.linux-arm.mk | 2 |
8 files changed, 16 insertions, 0 deletions
diff --git a/dl/openmax_dl.target.darwin-arm.mk b/dl/openmax_dl.target.darwin-arm.mk index 6e3913f..629d86f 100644 --- a/dl/openmax_dl.target.darwin-arm.mk +++ b/dl/openmax_dl.target.darwin-arm.mk @@ -163,6 +163,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/openmax_dl \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ @@ -264,6 +265,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/openmax_dl \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ diff --git a/dl/openmax_dl.target.darwin-x86.mk b/dl/openmax_dl.target.darwin-x86.mk index 0a828a1..897dafa 100644 --- a/dl/openmax_dl.target.darwin-x86.mk +++ b/dl/openmax_dl.target.darwin-x86.mk @@ -130,6 +130,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/openmax_dl \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ @@ -225,6 +226,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/openmax_dl \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ diff --git a/dl/openmax_dl.target.darwin-x86_64.mk b/dl/openmax_dl.target.darwin-x86_64.mk index e0668af..35a66d8 100644 --- a/dl/openmax_dl.target.darwin-x86_64.mk +++ b/dl/openmax_dl.target.darwin-x86_64.mk @@ -129,6 +129,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/openmax_dl \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ @@ -223,6 +224,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/openmax_dl \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ diff --git a/dl/openmax_dl.target.linux-arm.mk b/dl/openmax_dl.target.linux-arm.mk index 6e3913f..629d86f 100644 --- a/dl/openmax_dl.target.linux-arm.mk +++ b/dl/openmax_dl.target.linux-arm.mk @@ -163,6 +163,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/openmax_dl \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ @@ -264,6 +265,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/openmax_dl \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ diff --git a/dl/openmax_dl.target.linux-x86.mk b/dl/openmax_dl.target.linux-x86.mk index 0a828a1..897dafa 100644 --- a/dl/openmax_dl.target.linux-x86.mk +++ b/dl/openmax_dl.target.linux-x86.mk @@ -130,6 +130,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/openmax_dl \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ @@ -225,6 +226,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/openmax_dl \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ diff --git a/dl/openmax_dl.target.linux-x86_64.mk b/dl/openmax_dl.target.linux-x86_64.mk index e0668af..35a66d8 100644 --- a/dl/openmax_dl.target.linux-x86_64.mk +++ b/dl/openmax_dl.target.linux-x86_64.mk @@ -129,6 +129,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/openmax_dl \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ @@ -223,6 +224,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/openmax_dl \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ diff --git a/dl/openmax_dl_armv7.target.darwin-arm.mk b/dl/openmax_dl_armv7.target.darwin-arm.mk index 3d33341..20330c1 100644 --- a/dl/openmax_dl_armv7.target.darwin-arm.mk +++ b/dl/openmax_dl_armv7.target.darwin-arm.mk @@ -116,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/openmax_dl \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ @@ -215,6 +216,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/openmax_dl \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ diff --git a/dl/openmax_dl_armv7.target.linux-arm.mk b/dl/openmax_dl_armv7.target.linux-arm.mk index 3d33341..20330c1 100644 --- a/dl/openmax_dl_armv7.target.linux-arm.mk +++ b/dl/openmax_dl_armv7.target.linux-arm.mk @@ -116,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/openmax_dl \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ @@ -215,6 +216,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/openmax_dl \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ |