Commit b3385301 authored by Natalie Chouinard's avatar Natalie Chouinard Committed by Commit Bot

Update //remoting/android build templates

Use java_files instead of sources in GN build templates in
//remoting/android.

TBR=joedow@chromium.org

Bug: 1035074
Change-Id: I7786b905f26b9d9180eba01748218ad3ec2ea74c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1980970Reviewed-by: default avatarNatalie Chouinard <chouinard@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727240}
parent 59ca0df5
...@@ -7,8 +7,8 @@ import("//remoting/remoting_options.gni") ...@@ -7,8 +7,8 @@ import("//remoting/remoting_options.gni")
template("remoting_android_client_java_tmpl") { template("remoting_android_client_java_tmpl") {
android_library(target_name) { android_library(target_name) {
_java_file_prefix = "//remoting/android/java/src/org/chromium/chromoting" _sources_prefix = "//remoting/android/java/src/org/chromium/chromoting"
_java_files = [ _sources = [
"ActivityLifecycleListener.java", "ActivityLifecycleListener.java",
"AnimationJob.java", "AnimationJob.java",
"Capabilities.java", "Capabilities.java",
...@@ -46,6 +46,7 @@ template("remoting_android_client_java_tmpl") { ...@@ -46,6 +46,7 @@ template("remoting_android_client_java_tmpl") {
"SizeChangedEventParameter.java", "SizeChangedEventParameter.java",
"SwipePinchDetector.java", "SwipePinchDetector.java",
"SystemUiVisibilityChangedEventParameter.java", "SystemUiVisibilityChangedEventParameter.java",
"TapEventParameter.java",
"TapGestureDetector.java", "TapGestureDetector.java",
"TermsOfServiceActivity.java", "TermsOfServiceActivity.java",
"ThirdPartyTokenFetcher.java", "ThirdPartyTokenFetcher.java",
...@@ -53,7 +54,6 @@ template("remoting_android_client_java_tmpl") { ...@@ -53,7 +54,6 @@ template("remoting_android_client_java_tmpl") {
"TouchInputHandler.java", "TouchInputHandler.java",
"TouchInputStrategy.java", "TouchInputStrategy.java",
"TrackpadInputStrategy.java", "TrackpadInputStrategy.java",
"TapEventParameter.java",
"TwoPointsEventParameter.java", "TwoPointsEventParameter.java",
"WebViewActivity.java", "WebViewActivity.java",
"accountswitcher/AccountManagerCompat.java", "accountswitcher/AccountManagerCompat.java",
...@@ -71,15 +71,15 @@ template("remoting_android_client_java_tmpl") { ...@@ -71,15 +71,15 @@ template("remoting_android_client_java_tmpl") {
"help/HelpSingleton.java", "help/HelpSingleton.java",
"jni/Client.java", "jni/Client.java",
"jni/ConnectionListener.java", "jni/ConnectionListener.java",
"jni/GlDisplay.java",
"jni/DirectoryService.java", "jni/DirectoryService.java",
"jni/GlDisplay.java",
"jni/JniInterface.java", "jni/JniInterface.java",
"jni/JniOAuthTokenGetter.java", "jni/JniOAuthTokenGetter.java",
"jni/NotificationPresenter.java", "jni/NotificationPresenter.java",
"jni/TouchEventData.java", "jni/TouchEventData.java",
] ]
java_files = rebase_path(_java_files, ".", _java_file_prefix) sources = rebase_path(_sources, ".", _sources_prefix)
deps = [ deps = [
"//base:base_java", "//base:base_java",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment