Chromium refactor: Replace "resources_dirs" with "sources"
Bug: chromium:1062263
Change-Id: I4b7b06cfeaf4cb655a0b3533dba25a77756bdcd0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/171741
Commit-Queue: Andrew Grieve <agrieve@google.com>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30889}
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 4f76cad..4d6d14d 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -154,8 +154,43 @@
android_resources("AppRTCMobile_resources") {
testonly = true
- resource_dirs = [ "androidapp/res" ]
+ sources = [
+ "androidapp/res/drawable-hdpi/disconnect.png",
+ "androidapp/res/drawable-hdpi/ic_action_full_screen.png",
+ "androidapp/res/drawable-hdpi/ic_action_return_from_full_screen.png",
+ "androidapp/res/drawable-hdpi/ic_launcher.png",
+ "androidapp/res/drawable-hdpi/ic_loopback_call.png",
+ "androidapp/res/drawable-ldpi/disconnect.png",
+ "androidapp/res/drawable-ldpi/ic_action_full_screen.png",
+ "androidapp/res/drawable-ldpi/ic_action_return_from_full_screen.png",
+ "androidapp/res/drawable-ldpi/ic_launcher.png",
+ "androidapp/res/drawable-ldpi/ic_loopback_call.png",
+ "androidapp/res/drawable-mdpi/disconnect.png",
+ "androidapp/res/drawable-mdpi/ic_action_full_screen.png",
+ "androidapp/res/drawable-mdpi/ic_action_return_from_full_screen.png",
+ "androidapp/res/drawable-mdpi/ic_launcher.png",
+ "androidapp/res/drawable-mdpi/ic_loopback_call.png",
+ "androidapp/res/drawable-xhdpi/disconnect.png",
+ "androidapp/res/drawable-xhdpi/ic_action_full_screen.png",
+ "androidapp/res/drawable-xhdpi/ic_action_return_from_full_screen.png",
+ "androidapp/res/drawable-xhdpi/ic_launcher.png",
+ "androidapp/res/drawable-xhdpi/ic_loopback_call.png",
+ "androidapp/res/layout/activity_call.xml",
+ "androidapp/res/layout/activity_connect.xml",
+ "androidapp/res/layout/fragment_call.xml",
+ "androidapp/res/layout/fragment_hud.xml",
+ "androidapp/res/menu/connect_menu.xml",
+ "androidapp/res/values/arrays.xml",
+ "androidapp/res/values/strings.xml",
+ "androidapp/res/values-v17/styles.xml",
+ "androidapp/res/values-v21/styles.xml",
+ "androidapp/res/xml/preferences.xml",
+ ]
custom_package = "org.appspot.apprtc"
+
+ # Needed for Bazel converter.
+ resource_dirs = [ "androidapp/res" ]
+ assert(resource_dirs != []) # Mark as used.
}
rtc_instrumentation_test_apk("AppRTCMobile_test_apk") {
diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn
index 9dd2bf4..9c114e8 100644
--- a/examples/androidnativeapi/BUILD.gn
+++ b/examples/androidnativeapi/BUILD.gn
@@ -65,7 +65,14 @@
android_resources("resources") {
testonly = true
- resource_dirs = [ "res" ]
custom_package = "org.webrtc.examples.androidnativeapi"
+ sources = [
+ "res/layout/activity_main.xml",
+ "res/values/strings.xml",
+ ]
+
+ # Needed for Bazel converter.
+ resource_dirs = [ "res" ]
+ assert(resource_dirs != []) # Mark as used.
}
}
diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn
index 96f8533..47e600a 100644
--- a/rtc_tools/network_tester/BUILD.gn
+++ b/rtc_tools/network_tester/BUILD.gn
@@ -130,8 +130,24 @@
android_resources("NetworkTesterMobile_resources") {
testonly = true
- resource_dirs = [ "androidapp/res" ]
custom_package = "com.google.media.networktester"
+ sources = [
+ "androidapp/res/layout/activity_main.xml",
+ "androidapp/res/mipmap-hdpi/ic_launcher.png",
+ "androidapp/res/mipmap-mdpi/ic_launcher.png",
+ "androidapp/res/mipmap-xhdpi/ic_launcher.png",
+ "androidapp/res/mipmap-xxhdpi/ic_launcher.png",
+ "androidapp/res/mipmap-xxxhdpi/ic_launcher.png",
+ "androidapp/res/values/colors.xml",
+ "androidapp/res/values/dimens.xml",
+ "androidapp/res/values/strings.xml",
+ "androidapp/res/values-v17/styles.xml",
+ "androidapp/res/values-w820dp/dimens.xml",
+ ]
+
+ # Needed for Bazel converter.
+ resource_dirs = [ "androidapp/res" ]
+ assert(resource_dirs != []) # Mark as used.
}
rtc_shared_library("network_tester_so") {
