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 /sync | |
| 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 'sync')
| -rw-r--r-- | sync/BUILD.gn | 7 | ||||
| -rw-r--r-- | sync/android/BUILD.gn | 26 |
2 files changed, 30 insertions, 3 deletions
diff --git a/sync/BUILD.gn b/sync/BUILD.gn index 6b39d6d..a05dacf 100644 --- a/sync/BUILD.gn +++ b/sync/BUILD.gn @@ -864,7 +864,12 @@ if (is_android) { "//base:base_java_test_support", "//third_party/jsr-305:jsr_305_javalib", ] - DEPRECATED_java_in_dir = "test/android/javatests/src" + java_files = [ + "test/android/javatests/src/org/chromium/sync/test/util/AccountHolder.java", + "test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java", + "test/android/javatests/src/org/chromium/sync/test/util/MockSyncContentResolverDelegate.java", + "test/android/javatests/src/org/chromium/sync/test/util/SimpleFuture.java", + ] } # GYP: //sync/sync_tests.gypi:test_support_sync_fake_server_android diff --git a/sync/android/BUILD.gn b/sync/android/BUILD.gn index 0f6d2e4..a906d3d 100644 --- a/sync/android/BUILD.gn +++ b/sync/android/BUILD.gn @@ -16,7 +16,24 @@ android_library("sync_java") { google_play_services_library, ] srcjar_deps = [ ":java_enums" ] - DEPRECATED_java_in_dir = "java/src" + java_files = [ + "java/src/org/chromium/sync/AndroidSyncSettings.java", + "java/src/org/chromium/sync/ModelTypeHelper.java", + "java/src/org/chromium/sync/PassphraseType.java", + "java/src/org/chromium/sync/SyncConstants.java", + "java/src/org/chromium/sync/SyncContentResolverDelegate.java", + "java/src/org/chromium/sync/SystemSyncContentResolverDelegate.java", + "java/src/org/chromium/sync/notifier/InvalidationClientNameGenerator.java", + "java/src/org/chromium/sync/notifier/InvalidationClientNameProvider.java", + "java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java", + "java/src/org/chromium/sync/notifier/InvalidationPreferences.java", + "java/src/org/chromium/sync/notifier/RandomizedInvalidationClientNameGenerator.java", + "java/src/org/chromium/sync/signin/AccountManagerDelegate.java", + "java/src/org/chromium/sync/signin/AccountManagerHelper.java", + "java/src/org/chromium/sync/signin/AuthException.java", + "java/src/org/chromium/sync/signin/ChromeSigninController.java", + "java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java", + ] } android_library("sync_javatests") { @@ -30,7 +47,12 @@ android_library("sync_javatests") { "//third_party/cacheinvalidation:cacheinvalidation_proto_java", "//third_party/jsr-305:jsr_305_javalib", ] - DEPRECATED_java_in_dir = "javatests/src" + java_files = [ + "javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java", + "javatests/src/org/chromium/sync/notifier/InvalidationClientNameProviderTest.java", + "javatests/src/org/chromium/sync/notifier/InvalidationPreferencesTest.java", + "javatests/src/org/chromium/sync/notifier/signin/AccountManagerHelperTest.java", + ] } # GYP: //sync/sync_android.gypi:model_type_java |