diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-15 16:19:16 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-15 16:19:16 +0000 |
| commit | 098568936e858c103b66b400f2b74f8305e2ca68 (patch) | |
| tree | 6e2c9cc294c79e4172b348a0558f316216778ad0 | |
| parent | a0314b3030f740895497f46bac01668114fc3ce3 (diff) | |
| download | ots-098568936e858c103b66b400f2b74f8305e2ca68.tar.gz | |
Update makefiles after merge of Chromium at 6e9c84566c9f
This commit was generated by merge_from_chromium.py.
Change-Id: I428ef84cb5b38e50b9ad568dac26bff9874793fc
| -rw-r--r-- | ots.target.darwin-arm.mk | 3 | ||||
| -rw-r--r-- | ots.target.darwin-arm64.mk | 3 | ||||
| -rw-r--r-- | ots.target.darwin-mips.mk | 3 | ||||
| -rw-r--r-- | ots.target.darwin-x86.mk | 3 | ||||
| -rw-r--r-- | ots.target.darwin-x86_64.mk | 3 | ||||
| -rw-r--r-- | ots.target.linux-arm.mk | 3 | ||||
| -rw-r--r-- | ots.target.linux-arm64.mk | 3 | ||||
| -rw-r--r-- | ots.target.linux-mips.mk | 3 | ||||
| -rw-r--r-- | ots.target.linux-x86.mk | 3 | ||||
| -rw-r--r-- | ots.target.linux-x86_64.mk | 3 |
10 files changed, 30 insertions, 0 deletions
diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk index f5b4f29..f569e82 100644 --- a/ots.target.darwin-arm.mk +++ b/ots.target.darwin-arm.mk @@ -268,6 +268,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_ots_ots_gyp diff --git a/ots.target.darwin-arm64.mk b/ots.target.darwin-arm64.mk index 2c556ed..334001e 100644 --- a/ots.target.darwin-arm64.mk +++ b/ots.target.darwin-arm64.mk @@ -244,6 +244,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_ots_ots_gyp diff --git a/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk index 247805f..4eb3284 100644 --- a/ots.target.darwin-mips.mk +++ b/ots.target.darwin-mips.mk @@ -252,6 +252,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_ots_ots_gyp diff --git a/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk index 93968da..4d4ac64 100644 --- a/ots.target.darwin-x86.mk +++ b/ots.target.darwin-x86.mk @@ -256,6 +256,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_ots_ots_gyp diff --git a/ots.target.darwin-x86_64.mk b/ots.target.darwin-x86_64.mk index 24d537b..e85d2bf 100644 --- a/ots.target.darwin-x86_64.mk +++ b/ots.target.darwin-x86_64.mk @@ -254,6 +254,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_ots_ots_gyp diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk index f5b4f29..f569e82 100644 --- a/ots.target.linux-arm.mk +++ b/ots.target.linux-arm.mk @@ -268,6 +268,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_ots_ots_gyp diff --git a/ots.target.linux-arm64.mk b/ots.target.linux-arm64.mk index 2c556ed..334001e 100644 --- a/ots.target.linux-arm64.mk +++ b/ots.target.linux-arm64.mk @@ -244,6 +244,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_ots_ots_gyp diff --git a/ots.target.linux-mips.mk b/ots.target.linux-mips.mk index 247805f..4eb3284 100644 --- a/ots.target.linux-mips.mk +++ b/ots.target.linux-mips.mk @@ -252,6 +252,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_ots_ots_gyp diff --git a/ots.target.linux-x86.mk b/ots.target.linux-x86.mk index 93968da..4d4ac64 100644 --- a/ots.target.linux-x86.mk +++ b/ots.target.linux-x86.mk @@ -256,6 +256,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_ots_ots_gyp diff --git a/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk index 24d537b..e85d2bf 100644 --- a/ots.target.linux-x86_64.mk +++ b/ots.target.linux-x86_64.mk @@ -254,6 +254,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_ots_ots_gyp |