diff options
| author | agrieve <agrieve@chromium.org> | 2016-03-23 12:54:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-23 19:56:08 +0000 |
| commit | 696e6a571b4db1a966ac7b49260eaa47a1ba9bd4 (patch) | |
| tree | ab0ed8882e7007158755b234d9957c710380dd38 /content/shell | |
| parent | 96a958a950c47965cda6ceaf9ca2990685b2e8e9 (diff) | |
| download | chromium_src-696e6a571b4db1a966ac7b49260eaa47a1ba9bd4.zip chromium_src-696e6a571b4db1a966ac7b49260eaa47a1ba9bd4.tar.gz chromium_src-696e6a571b4db1a966ac7b49260eaa47a1ba9bd4.tar.bz2 | |
Replace usages of DEPRECATED_java_in_dir with java_files
BUG=484854
Review URL: https://codereview.chromium.org/1829823002
Cr-Commit-Position: refs/heads/master@{#382905}
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/android/BUILD.gn | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/content/shell/android/BUILD.gn b/content/shell/android/BUILD.gn index 616a84d..957a9c1 100644 --- a/content/shell/android/BUILD.gn +++ b/content/shell/android/BUILD.gn @@ -51,7 +51,12 @@ android_library("content_shell_java") { "//net/android:net_java", "//ui/android:ui_java", ] - DEPRECATED_java_in_dir = "java/src" + java_files = [ + "java/src/org/chromium/content_shell/Shell.java", + "java/src/org/chromium/content_shell/ShellLayoutTestUtils.java", + "java/src/org/chromium/content_shell/ShellManager.java", + "java/src/org/chromium/content_shell/ShellMojoTestUtils.java", + ] } content_shell_manifest = @@ -84,7 +89,10 @@ android_library("content_shell_apk_java") { "//net/android:net_java", "//ui/android:ui_java", ] - DEPRECATED_java_in_dir = "shell_apk/src" + java_files = [ + "shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java", + "shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java", + ] } android_assets("content_shell_assets") { @@ -132,7 +140,12 @@ android_library("content_shell_test_java") { "//content/public/test/android:content_java_test_support", "//content/shell/android:content_shell_java", ] - DEPRECATED_java_in_dir = "javatests/src" + java_files = [ + "javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest.java", + "javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTest.java", + "javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java", + "javatests/src/org/chromium/content_shell_apk/ContentShellUrlTest.java", + ] } instrumentation_test_apk("content_shell_test_apk") { @@ -184,7 +197,11 @@ if (current_cpu != "x64") { ] android_manifest = chromium_linker_test_manifest apk_name = "ChromiumLinkerTest" - DEPRECATED_java_in_dir = "linker_test_apk/src" + java_files = [ + "linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java", + "linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestApplication.java", + "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java", + ] native_libs = [ "liblinker_test.so" ] use_chromium_linker = true enable_chromium_linker_tests = true @@ -230,5 +247,5 @@ android_library("content_shell_browsertests_java") { "//testing/android/native_test:native_test_java", "//ui/android:ui_java", ] - DEPRECATED_java_in_dir = "browsertests/src" + java_files = [ "browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java" ] } |