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 | 8e8cc4dc085aded1e4e3875425f333598ab24c18 (patch) | |
| tree | 01161b34ae38f7332ef7590238af85a5329e01ee | |
| parent | 233a2da4b45f54c4c01a335c0205075cbb399a9e (diff) | |
| download | libsrtp-8e8cc4dc085aded1e4e3875425f333598ab24c18.tar.gz | |
Update makefiles after merge of Chromium at 277428
This commit was generated by merge_from_chromium.py.
Change-Id: Ia4bf8a9cdd4c1d3fb5dd9f4e9c036202292de5cb
| -rw-r--r-- | libsrtp.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | libsrtp.target.darwin-arm64.mk | 2 | ||||
| -rw-r--r-- | libsrtp.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | libsrtp.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | libsrtp.target.darwin-x86_64.mk | 2 | ||||
| -rw-r--r-- | libsrtp.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | libsrtp.target.linux-arm64.mk | 2 | ||||
| -rw-r--r-- | libsrtp.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | libsrtp.target.linux-x86.mk | 2 | ||||
| -rw-r--r-- | libsrtp.target.linux-x86_64.mk | 2 |
10 files changed, 20 insertions, 0 deletions
diff --git a/libsrtp.target.darwin-arm.mk b/libsrtp.target.darwin-arm.mk index 770bbbd..c0aa58c 100644 --- a/libsrtp.target.darwin-arm.mk +++ b/libsrtp.target.darwin-arm.mk @@ -147,6 +147,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libsrtp/config \ $(LOCAL_PATH)/third_party/libsrtp/srtp/include \ $(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -262,6 +263,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libsrtp/config \ $(LOCAL_PATH)/third_party/libsrtp/srtp/include \ $(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/libsrtp.target.darwin-arm64.mk b/libsrtp.target.darwin-arm64.mk index 8ed655c..ca51ff0 100644 --- a/libsrtp.target.darwin-arm64.mk +++ b/libsrtp.target.darwin-arm64.mk @@ -137,6 +137,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libsrtp/config \ $(LOCAL_PATH)/third_party/libsrtp/srtp/include \ $(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -241,6 +242,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libsrtp/config \ $(LOCAL_PATH)/third_party/libsrtp/srtp/include \ $(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/libsrtp.target.darwin-mips.mk b/libsrtp.target.darwin-mips.mk index b63e7c9..16f180c 100644 --- a/libsrtp.target.darwin-mips.mk +++ b/libsrtp.target.darwin-mips.mk @@ -142,6 +142,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libsrtp/config \ $(LOCAL_PATH)/third_party/libsrtp/srtp/include \ $(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -252,6 +253,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libsrtp/config \ $(LOCAL_PATH)/third_party/libsrtp/srtp/include \ $(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/libsrtp.target.darwin-x86.mk b/libsrtp.target.darwin-x86.mk index 44660d5..e3ec5c0 100644 --- a/libsrtp.target.darwin-x86.mk +++ b/libsrtp.target.darwin-x86.mk @@ -142,6 +142,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libsrtp/config \ $(LOCAL_PATH)/third_party/libsrtp/srtp/include \ $(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -251,6 +252,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libsrtp/config \ $(LOCAL_PATH)/third_party/libsrtp/srtp/include \ $(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/libsrtp.target.darwin-x86_64.mk b/libsrtp.target.darwin-x86_64.mk index 2aa903a..18aa79b 100644 --- a/libsrtp.target.darwin-x86_64.mk +++ b/libsrtp.target.darwin-x86_64.mk @@ -141,6 +141,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libsrtp/config \ $(LOCAL_PATH)/third_party/libsrtp/srtp/include \ $(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -249,6 +250,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libsrtp/config \ $(LOCAL_PATH)/third_party/libsrtp/srtp/include \ $(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/libsrtp.target.linux-arm.mk b/libsrtp.target.linux-arm.mk index 770bbbd..c0aa58c 100644 --- a/libsrtp.target.linux-arm.mk +++ b/libsrtp.target.linux-arm.mk @@ -147,6 +147,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libsrtp/config \ $(LOCAL_PATH)/third_party/libsrtp/srtp/include \ $(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -262,6 +263,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libsrtp/config \ $(LOCAL_PATH)/third_party/libsrtp/srtp/include \ $(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/libsrtp.target.linux-arm64.mk b/libsrtp.target.linux-arm64.mk index 8ed655c..ca51ff0 100644 --- a/libsrtp.target.linux-arm64.mk +++ b/libsrtp.target.linux-arm64.mk @@ -137,6 +137,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libsrtp/config \ $(LOCAL_PATH)/third_party/libsrtp/srtp/include \ $(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -241,6 +242,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libsrtp/config \ $(LOCAL_PATH)/third_party/libsrtp/srtp/include \ $(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/libsrtp.target.linux-mips.mk b/libsrtp.target.linux-mips.mk index b63e7c9..16f180c 100644 --- a/libsrtp.target.linux-mips.mk +++ b/libsrtp.target.linux-mips.mk @@ -142,6 +142,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libsrtp/config \ $(LOCAL_PATH)/third_party/libsrtp/srtp/include \ $(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -252,6 +253,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libsrtp/config \ $(LOCAL_PATH)/third_party/libsrtp/srtp/include \ $(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/libsrtp.target.linux-x86.mk b/libsrtp.target.linux-x86.mk index 44660d5..e3ec5c0 100644 --- a/libsrtp.target.linux-x86.mk +++ b/libsrtp.target.linux-x86.mk @@ -142,6 +142,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libsrtp/config \ $(LOCAL_PATH)/third_party/libsrtp/srtp/include \ $(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -251,6 +252,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libsrtp/config \ $(LOCAL_PATH)/third_party/libsrtp/srtp/include \ $(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/libsrtp.target.linux-x86_64.mk b/libsrtp.target.linux-x86_64.mk index 2aa903a..18aa79b 100644 --- a/libsrtp.target.linux-x86_64.mk +++ b/libsrtp.target.linux-x86_64.mk @@ -141,6 +141,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libsrtp/config \ $(LOCAL_PATH)/third_party/libsrtp/srtp/include \ $(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -249,6 +250,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libsrtp/config \ $(LOCAL_PATH)/third_party/libsrtp/srtp/include \ $(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport |