admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add is_android guard to all Android rule usages.

Browse Source 
Android rules contain `assert is_android`.
This didn't cause any problems only because GN doesn't touch files if they are not referenced from the root BUILD.gn file.

Skipping presubmit because this CL triggers a warning even though it's just adding indentation.

No-Presubmit: True
Bug: None
Change-Id: Ifcb8f0e1d47784ff800507f9d560c68e8f78c717
Reviewed-on: https://webrtc-review.googlesource.com/90040
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24061}
This commit is contained in:
Oleh Prypin 2018-07-23 10:01:26 +02:00 committed by Commit Bot
parent 3d72f6dac8
commit fdc0ef11ad
3 changed files with 1422 additions and 1415 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/androidapp/third_party/autobanh/BUILD.gn vendored
View File

@ -6,8 +6,10 @@
# in the file PATENTS. All contributing project authors may # in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
import("//build/config/android/rules.gni") if (is_android) {
import("//build/config/android/rules.gni")
android_java_prebuilt("autobanh_java") { android_java_prebuilt("autobanh_java") {
jar_path = "lib/autobanh.jar" jar_path = "lib/autobanh.jar"
}
} }

136
examples/androidnativeapi/BUILD.gn
View File

@ -1,73 +1,75 @@
import("//webrtc.gni") import("//webrtc.gni")
rtc_android_apk("androidnativeapi") { if (is_android) {
testonly = true rtc_android_apk("androidnativeapi") {
apk_name = "androidnativeapi" testonly = true
android_manifest = "AndroidManifest.xml" apk_name = "androidnativeapi"
android_manifest = "AndroidManifest.xml"
java_files = [ java_files = [
"java/org/webrtc/examples/androidnativeapi/MainActivity.java", "java/org/webrtc/examples/androidnativeapi/MainActivity.java",
"java/org/webrtc/examples/androidnativeapi/CallClient.java", "java/org/webrtc/examples/androidnativeapi/CallClient.java",
] ]
deps = [ deps = [
":resources", ":resources",
"//modules/audio_device:audio_device_java", "//modules/audio_device:audio_device_java",
"//sdk/android:camera_java", "//sdk/android:camera_java",
"//sdk/android:surfaceviewrenderer_java", "//sdk/android:surfaceviewrenderer_java",
"//sdk/android:video_api_java", "//sdk/android:video_api_java",
"//sdk/android:video_java", "//sdk/android:video_java",
] ]
shared_libraries = [ ":examples_androidnativeapi_jni" ] shared_libraries = [ ":examples_androidnativeapi_jni" ]
} }
generate_jni("generated_jni") { generate_jni("generated_jni") {
testonly = true testonly = true
sources = [ sources = [
"java/org/webrtc/examples/androidnativeapi/CallClient.java", "java/org/webrtc/examples/androidnativeapi/CallClient.java",
] ]
jni_package = "" jni_package = ""
namespace = "webrtc_examples" namespace = "webrtc_examples"
jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h" jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
} }
rtc_shared_library("examples_androidnativeapi_jni") { rtc_shared_library("examples_androidnativeapi_jni") {
testonly = true testonly = true
sources = [ sources = [
"jni/androidcallclient.cc", "jni/androidcallclient.cc",
"jni/androidcallclient.h", "jni/androidcallclient.h",
"jni/onload.cc", "jni/onload.cc",
] ]
suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ] suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ]
configs += [ "//build/config/android:hide_all_but_jni" ] configs += [ "//build/config/android:hide_all_but_jni" ]
deps = [ deps = [
":generated_jni", ":generated_jni",
"//api:libjingle_peerconnection_api", "//api:libjingle_peerconnection_api",
"//api/audio_codecs:builtin_audio_decoder_factory", "//api/audio_codecs:builtin_audio_decoder_factory",
"//api/audio_codecs:builtin_audio_encoder_factory", "//api/audio_codecs:builtin_audio_encoder_factory",
"//logging:rtc_event_log_impl_base", "//logging:rtc_event_log_impl_base",
"//media:rtc_audio_video", "//media:rtc_audio_video",
"//media:rtc_internal_video_codecs", "//media:rtc_internal_video_codecs",
"//modules/audio_processing", "//modules/audio_processing",
"//modules/utility:utility", "//modules/utility:utility",
"//pc:libjingle_peerconnection", "//pc:libjingle_peerconnection",
"//rtc_base:rtc_base", "//rtc_base:rtc_base",
"//rtc_base:rtc_base_approved", "//rtc_base:rtc_base_approved",
"//sdk/android:native_api_base", "//sdk/android:native_api_base",
"//sdk/android:native_api_jni", "//sdk/android:native_api_jni",
"//sdk/android:native_api_video", "//sdk/android:native_api_video",
"//system_wrappers:field_trial_default", "//system_wrappers:field_trial_default",
"//system_wrappers:metrics_default", "//system_wrappers:metrics_default",
"//system_wrappers:runtime_enabled_features_default", "//system_wrappers:runtime_enabled_features_default",
"//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/memory",
] ]
} }
android_resources("resources") { android_resources("resources") {
testonly = true testonly = true
resource_dirs = [ "res" ] resource_dirs = [ "res" ]
custom_package = "org.webrtc.examples.androidnativeapi" custom_package = "org.webrtc.examples.androidnativeapi"
}
} }

2693
sdk/android/BUILD.gn
View File

File diff suppressed because it is too large Load Diff