Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(197)

Side by Side Diff: webrtc/api/BUILD.gn

Issue 2376753003: GN: Fix incorrect include_dir for libjingle_peerconnection_jni target (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 import("../build/webrtc.gni") 9 import("../build/webrtc.gni")
10 if (is_android) { 10 if (is_android) {
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 "../system_wrappers:metrics_default", 210 "../system_wrappers:metrics_default",
211 ] 211 ]
212 212
213 if (rtc_build_libyuv) { 213 if (rtc_build_libyuv) {
214 deps += [ "$rtc_libyuv_dir" ] 214 deps += [ "$rtc_libyuv_dir" ]
215 public_deps = [ 215 public_deps = [
216 "$rtc_libyuv_dir", 216 "$rtc_libyuv_dir",
217 ] 217 ]
218 } else { 218 } else {
219 # Need to add a directory normally exported by libyuv. 219 # Need to add a directory normally exported by libyuv.
220 include_dirs += [ "$rtc_libyuv_dir/include" ] 220 include_dirs = [ "$rtc_libyuv_dir/include" ]
221 } 221 }
222 } 222 }
223 223
224 rtc_shared_library("libjingle_peerconnection_so") { 224 rtc_shared_library("libjingle_peerconnection_so") {
225 sources = [ 225 sources = [
226 "android/jni/jni_onload.cc", 226 "android/jni/jni_onload.cc",
227 ] 227 ]
228 228
229 suppressed_configs += [ "//build/config/android:hide_native_jni_exports" ] 229 suppressed_configs += [ "//build/config/android:hide_native_jni_exports" ]
230 230
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 464
465 shared_libraries = [ ":libjingle_peerconnection_so" ] 465 shared_libraries = [ ":libjingle_peerconnection_so" ]
466 } 466 }
467 467
468 android_resources("libjingle_peerconnection_android_unittest_resources") { 468 android_resources("libjingle_peerconnection_android_unittest_resources") {
469 resource_dirs = [ "androidtests/res" ] 469 resource_dirs = [ "androidtests/res" ]
470 custom_package = "org.webrtc" 470 custom_package = "org.webrtc"
471 } 471 }
472 } 472 }
473 } 473 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698