diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-15 16:19:15 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-15 16:19:15 +0000 |
| commit | 93b1649b4927e6252d051a95bbf875f9eb29b090 (patch) | |
| tree | f11899684230a3608ec6cfb43cf20ab9e1b1cb4d | |
| parent | 278b498aee9a287b55841af44c079f5d0a5865c8 (diff) | |
| download | libsrtp-93b1649b4927e6252d051a95bbf875f9eb29b090.tar.gz | |
Update makefiles after merge of Chromium at 6e9c84566c9f
This commit was generated by merge_from_chromium.py.
Change-Id: I1c8a8cfb8ff23263959c9107757c172bed820fa6
| -rw-r--r-- | libsrtp.target.darwin-arm.mk | 3 | ||||
| -rw-r--r-- | libsrtp.target.darwin-arm64.mk | 3 | ||||
| -rw-r--r-- | libsrtp.target.darwin-mips.mk | 3 | ||||
| -rw-r--r-- | libsrtp.target.darwin-x86.mk | 3 | ||||
| -rw-r--r-- | libsrtp.target.darwin-x86_64.mk | 3 | ||||
| -rw-r--r-- | libsrtp.target.linux-arm.mk | 3 | ||||
| -rw-r--r-- | libsrtp.target.linux-arm64.mk | 3 | ||||
| -rw-r--r-- | libsrtp.target.linux-mips.mk | 3 | ||||
| -rw-r--r-- | libsrtp.target.linux-x86.mk | 3 | ||||
| -rw-r--r-- | libsrtp.target.linux-x86_64.mk | 3 |
10 files changed, 30 insertions, 0 deletions
diff --git a/libsrtp.target.darwin-arm.mk b/libsrtp.target.darwin-arm.mk index 4085ef4..8e6ddec 100644 --- a/libsrtp.target.darwin-arm.mk +++ b/libsrtp.target.darwin-arm.mk @@ -291,6 +291,9 @@ LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl +### Set directly by aosp_build_settings. +LOCAL_CLANG := false + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_libsrtp_libsrtp_gyp diff --git a/libsrtp.target.darwin-arm64.mk b/libsrtp.target.darwin-arm64.mk index 8cc80ce..b967bff 100644 --- a/libsrtp.target.darwin-arm64.mk +++ b/libsrtp.target.darwin-arm64.mk @@ -265,6 +265,9 @@ LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl +### Set directly by aosp_build_settings. +LOCAL_CLANG := false + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_libsrtp_libsrtp_gyp diff --git a/libsrtp.target.darwin-mips.mk b/libsrtp.target.darwin-mips.mk index 4d16c70..763efac 100644 --- a/libsrtp.target.darwin-mips.mk +++ b/libsrtp.target.darwin-mips.mk @@ -277,6 +277,9 @@ LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl +### Set directly by aosp_build_settings. +LOCAL_CLANG := false + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_libsrtp_libsrtp_gyp diff --git a/libsrtp.target.darwin-x86.mk b/libsrtp.target.darwin-x86.mk index eca10cb..574d97c 100644 --- a/libsrtp.target.darwin-x86.mk +++ b/libsrtp.target.darwin-x86.mk @@ -279,6 +279,9 @@ LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl +### Set directly by aosp_build_settings. +LOCAL_CLANG := false + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_libsrtp_libsrtp_gyp diff --git a/libsrtp.target.darwin-x86_64.mk b/libsrtp.target.darwin-x86_64.mk index 459b790..8b76e5a 100644 --- a/libsrtp.target.darwin-x86_64.mk +++ b/libsrtp.target.darwin-x86_64.mk @@ -275,6 +275,9 @@ LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl +### Set directly by aosp_build_settings. +LOCAL_CLANG := false + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_libsrtp_libsrtp_gyp diff --git a/libsrtp.target.linux-arm.mk b/libsrtp.target.linux-arm.mk index 4085ef4..8e6ddec 100644 --- a/libsrtp.target.linux-arm.mk +++ b/libsrtp.target.linux-arm.mk @@ -291,6 +291,9 @@ LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl +### Set directly by aosp_build_settings. +LOCAL_CLANG := false + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_libsrtp_libsrtp_gyp diff --git a/libsrtp.target.linux-arm64.mk b/libsrtp.target.linux-arm64.mk index 8cc80ce..b967bff 100644 --- a/libsrtp.target.linux-arm64.mk +++ b/libsrtp.target.linux-arm64.mk @@ -265,6 +265,9 @@ LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl +### Set directly by aosp_build_settings. +LOCAL_CLANG := false + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_libsrtp_libsrtp_gyp diff --git a/libsrtp.target.linux-mips.mk b/libsrtp.target.linux-mips.mk index 4d16c70..763efac 100644 --- a/libsrtp.target.linux-mips.mk +++ b/libsrtp.target.linux-mips.mk @@ -277,6 +277,9 @@ LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl +### Set directly by aosp_build_settings. +LOCAL_CLANG := false + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_libsrtp_libsrtp_gyp diff --git a/libsrtp.target.linux-x86.mk b/libsrtp.target.linux-x86.mk index eca10cb..574d97c 100644 --- a/libsrtp.target.linux-x86.mk +++ b/libsrtp.target.linux-x86.mk @@ -279,6 +279,9 @@ LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl +### Set directly by aosp_build_settings. +LOCAL_CLANG := false + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_libsrtp_libsrtp_gyp diff --git a/libsrtp.target.linux-x86_64.mk b/libsrtp.target.linux-x86_64.mk index 459b790..8b76e5a 100644 --- a/libsrtp.target.linux-x86_64.mk +++ b/libsrtp.target.linux-x86_64.mk @@ -275,6 +275,9 @@ LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl +### Set directly by aosp_build_settings. +LOCAL_CLANG := false + # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules gyp_all_modules: third_party_libsrtp_libsrtp_gyp |