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

Migrate android_resources targets to not create R.java files

Browse Source 
R.java file creation responsibilities will be moved to android_library
and android_apk targets and creating R.java files in the
android_resources targets is now deprecated. This cl migrates webrtc
targets to the new way.

Bug: chromium:1073476
Change-Id: I0a2fa759d3ff1d8e201e5719c9238701a58171e9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/183060
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32026}
This commit is contained in:
Mohamed Heikal 2020-09-01 15:51:12 -04:00 committed by Commit Bot
parent 2597a1b22c
commit 3f94fc53d4
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/BUILD.gn
View File

@ -130,6 +130,7 @@ if (is_android) {
"androidapp/src/org/appspot/apprtc/util/AsyncHttpURLConnection.java",
]
resources_package = "org.appspot.apprtc"
deps = [
":AppRTCMobile_resources",
"../rtc_base:base_java",
@ -187,9 +188,10 @@ if (is_android) {
"androidapp/res/values/strings.xml",
"androidapp/res/xml/preferences.xml",
]
custom_package = "org.appspot.apprtc"
create_srcjar = false
# Needed for Bazel converter.
custom_package = "org.appspot.apprtc"
resource_dirs = [ "androidapp/res" ]
assert(resource_dirs != []) # Mark as used.
}

1
examples/androidnativeapi/BUILD.gn
View File

@ -68,6 +68,7 @@ if (is_android) {
android_resources("resources") {
testonly = true
custom_package = "org.webrtc.examples.androidnativeapi"
create_srcjar = false
sources = [
"res/layout/activity_main.xml",
"res/values/strings.xml",

1
examples/androidvoip/BUILD.gn
View File

@ -76,6 +76,7 @@ if (is_android) {
android_resources("resources") {
testonly = true
custom_package = "org.webrtc.examples.androidvoip"
create_srcjar = false
sources = [
"res/layout/activity_main.xml",
"res/values/colors.xml",

2
rtc_tools/network_tester/BUILD.gn
View File

@ -123,6 +123,7 @@ if (is_android) {
"androidapp/src/com/google/media/networktester/NetworkTester.java",
]
resources_package = "com.google.media.networktester"
deps = [
":NetworkTesterMobile_resources",
"../../rtc_base:base_java",
@ -132,6 +133,7 @@ if (is_android) {
android_resources("NetworkTesterMobile_resources") {
testonly = true
custom_package = "com.google.media.networktester"
create_srcjar = false
sources = [
"androidapp/res/layout/activity_main.xml",
"androidapp/res/mipmap-hdpi/ic_launcher.png",