0

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}
This commit is contained in:
agrieve
2016-03-23 12:54:45 -07:00
committed by Commit bot
parent 96a958a950
commit 696e6a571b
39 changed files with 1936 additions and 58 deletions
base
BUILD.gn
android
jni_generator
build/android/rezip
chrome
android
test
BUILD.gn
chromedriver
test
webview_shell
components
BUILD.gn
bookmarks
common
android
cronet
android
gcm_driver
android
invalidation
navigation_interception
android
precache
android
service_tab_launcher
signin
core
browser
android
variations
android
web_contents_delegate_android
content
public
android
test
android
shell
android
test
media
base
android
capture
video
android
midi
net/android
printing
sync
testing/android/native_test
third_party
android_data_chart
android_media
android_swipe_refresh
cacheinvalidation
custom_tabs_client
tools/android
customtabs_benchmark
memconsumer
ui/android
url

@ -2129,7 +2129,67 @@ if (is_android) {
"//third_party/jsr-305:jsr_305_javalib",
]
DEPRECATED_java_in_dir = "android/java/src"
java_files = [
"android/java/src/org/chromium/base/ActivityState.java",
"android/java/src/org/chromium/base/AnimationFrameTimeHistogram.java",
"android/java/src/org/chromium/base/ApiCompatibilityUtils.java",
"android/java/src/org/chromium/base/ApkAssets.java",
"android/java/src/org/chromium/base/ApplicationStatus.java",
"android/java/src/org/chromium/base/BaseChromiumApplication.java",
"android/java/src/org/chromium/base/BaseSwitches.java",
"android/java/src/org/chromium/base/BuildInfo.java",
"android/java/src/org/chromium/base/Callback.java",
"android/java/src/org/chromium/base/CollectionUtil.java",
"android/java/src/org/chromium/base/CommandLine.java",
"android/java/src/org/chromium/base/CommandLineInitUtil.java",
"android/java/src/org/chromium/base/ContentUriUtils.java",
"android/java/src/org/chromium/base/ContextUtils.java",
"android/java/src/org/chromium/base/CpuFeatures.java",
"android/java/src/org/chromium/base/EventLog.java",
"android/java/src/org/chromium/base/FieldTrialList.java",
"android/java/src/org/chromium/base/FileUtils.java",
"android/java/src/org/chromium/base/ImportantFileWriterAndroid.java",
"android/java/src/org/chromium/base/JNIUtils.java",
"android/java/src/org/chromium/base/JavaHandlerThread.java",
"android/java/src/org/chromium/base/LocaleUtils.java",
"android/java/src/org/chromium/base/Log.java",
"android/java/src/org/chromium/base/MemoryPressureListener.java",
"android/java/src/org/chromium/base/ObserverList.java",
"android/java/src/org/chromium/base/PackageUtils.java",
"android/java/src/org/chromium/base/PathService.java",
"android/java/src/org/chromium/base/PathUtils.java",
"android/java/src/org/chromium/base/PerfTraceEvent.java",
"android/java/src/org/chromium/base/PowerMonitor.java",
"android/java/src/org/chromium/base/PowerStatusReceiver.java",
"android/java/src/org/chromium/base/ResourceExtractor.java",
"android/java/src/org/chromium/base/SecureRandomInitializer.java",
"android/java/src/org/chromium/base/StreamUtil.java",
"android/java/src/org/chromium/base/SysUtils.java",
"android/java/src/org/chromium/base/SystemMessageHandler.java",
"android/java/src/org/chromium/base/ThreadUtils.java",
"android/java/src/org/chromium/base/TraceEvent.java",
"android/java/src/org/chromium/base/VisibleForTesting.java",
"android/java/src/org/chromium/base/annotations/AccessedByNative.java",
"android/java/src/org/chromium/base/annotations/CalledByNative.java",
"android/java/src/org/chromium/base/annotations/CalledByNativeUnchecked.java",
"android/java/src/org/chromium/base/annotations/JNIAdditionalImport.java",
"android/java/src/org/chromium/base/annotations/JNINamespace.java",
"android/java/src/org/chromium/base/annotations/MainDex.java",
"android/java/src/org/chromium/base/annotations/NativeCall.java",
"android/java/src/org/chromium/base/annotations/NativeClassQualifiedName.java",
"android/java/src/org/chromium/base/annotations/RemovableInRelease.java",
"android/java/src/org/chromium/base/annotations/SuppressFBWarnings.java",
"android/java/src/org/chromium/base/annotations/UsedByReflection.java",
"android/java/src/org/chromium/base/library_loader/LegacyLinker.java",
"android/java/src/org/chromium/base/library_loader/LibraryLoader.java",
"android/java/src/org/chromium/base/library_loader/Linker.java",
"android/java/src/org/chromium/base/library_loader/LoaderErrors.java",
"android/java/src/org/chromium/base/library_loader/ModernLinker.java",
"android/java/src/org/chromium/base/library_loader/ProcessInitException.java",
"android/java/src/org/chromium/base/metrics/RecordHistogram.java",
"android/java/src/org/chromium/base/metrics/RecordUserAction.java",
"android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java",
]
# New versions of BuildConfig.java and NativeLibraries.java
# (with the actual correct values) will be created when creating an apk.
@ -2146,7 +2206,14 @@ if (is_android) {
":base_java",
":base_java_test_support",
]
DEPRECATED_java_in_dir = "android/javatests/src"
java_files = [
"android/javatests/src/org/chromium/base/AdvancedMockContextTest.java",
"android/javatests/src/org/chromium/base/ApiCompatibilityUtilsTest.java",
"android/javatests/src/org/chromium/base/CommandLineInitUtilTest.java",
"android/javatests/src/org/chromium/base/CommandLineTest.java",
"android/javatests/src/org/chromium/base/ObserverListTest.java",
"android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.java",
]
}
# GYP: //base.gyp:base_java_test_support
@ -2155,7 +2222,40 @@ if (is_android) {
":base_java",
"//testing/android/reporter:reporter_java",
]
DEPRECATED_java_in_dir = "test/android/javatests/src"
java_files = [
"test/android/javatests/src/org/chromium/base/test/BaseActivityInstrumentationTestCase.java",
"test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java",
"test/android/javatests/src/org/chromium/base/test/BaseTestResult.java",
"test/android/javatests/src/org/chromium/base/test/util/AdvancedMockContext.java",
"test/android/javatests/src/org/chromium/base/test/util/CommandLineFlags.java",
"test/android/javatests/src/org/chromium/base/test/util/DisableIf.java",
"test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java",
"test/android/javatests/src/org/chromium/base/test/util/DisabledTest.java",
"test/android/javatests/src/org/chromium/base/test/util/EnormousTest.java",
"test/android/javatests/src/org/chromium/base/test/util/Feature.java",
"test/android/javatests/src/org/chromium/base/test/util/HostDrivenTest.java",
"test/android/javatests/src/org/chromium/base/test/util/InMemorySharedPreferences.java",
"test/android/javatests/src/org/chromium/base/test/util/InstrumentationUtils.java",
"test/android/javatests/src/org/chromium/base/test/util/IntegrationTest.java",
"test/android/javatests/src/org/chromium/base/test/util/Manual.java",
"test/android/javatests/src/org/chromium/base/test/util/MetricsUtils.java",
"test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevel.java",
"test/android/javatests/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheck.java",
"test/android/javatests/src/org/chromium/base/test/util/PerfTest.java",
"test/android/javatests/src/org/chromium/base/test/util/Restriction.java",
"test/android/javatests/src/org/chromium/base/test/util/RestrictionSkipCheck.java",
"test/android/javatests/src/org/chromium/base/test/util/ScalableTimeout.java",
"test/android/javatests/src/org/chromium/base/test/util/SkipCheck.java",
"test/android/javatests/src/org/chromium/base/test/util/TestFileUtil.java",
"test/android/javatests/src/org/chromium/base/test/util/TestThread.java",
"test/android/javatests/src/org/chromium/base/test/util/TimeoutScale.java",
"test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java",
"test/android/javatests/src/org/chromium/base/test/util/parameter/BaseParameter.java",
"test/android/javatests/src/org/chromium/base/test/util/parameter/Parameter.java",
"test/android/javatests/src/org/chromium/base/test/util/parameter/Parameterizable.java",
"test/android/javatests/src/org/chromium/base/test/util/parameter/ParameterizedTest.java",
"test/android/javatests/src/org/chromium/base/test/util/parameter/parameters/MethodParameter.java",
]
}
# TODO(jbudorick): Remove this once we roll to robolectric 3.0 and pull

@ -34,7 +34,8 @@ generate_jni("jni_sample_header") {
# GYP: //base/android/jni_generator/jni_generator.gyp:jni_sample_java
android_library("jni_sample_java") {
DEPRECATED_java_in_dir = "java/src"
java_files =
[ "java/src/org/chromium/example/jni_generator/SampleForTests.java" ]
deps = [
"//base:base_java",
]

@ -7,5 +7,5 @@ import("//build/config/android/rules.gni")
# GYP: //build/android/rezip.gyp:rezip_apk_jar
java_library("rezip") {
jar_path = "$root_build_dir/lib.java/rezip_apk.jar"
DEPRECATED_java_in_dir = "."
java_files = [ "RezipApk.java" ]
}

@ -12,6 +12,7 @@ import("//testing/test.gni")
import("//third_party/icu/config.gni")
import("//third_party/protobuf/proto_library.gni")
import("channel.gni")
import("java_sources.gni")
manifest_package = "org.chromium.chrome"
@ -167,7 +168,8 @@ android_library("chrome_java") {
# TODO(sievers): Split java code into components. Not everything
# is really all that UI related here.
if (android_java_ui) {
DEPRECATED_java_in_dir = "java/src"
# From java_sources.gni.
java_files = chrome_java_sources
srcjar_deps += [
":custom_tabs_service_aidl",
@ -342,7 +344,9 @@ android_aidl("custom_tabs_service_aidl") {
# GYP: //chrome/android/chrome_apk.gyp:chrome_shared_test_java
android_library("chrome_shared_test_java") {
testonly = true
DEPRECATED_java_in_dir = "javatests/src"
# From java_sources.gni.
java_files = chrome_shared_test_java_sources
deps = [
"//base:base_java",
@ -555,7 +559,19 @@ instrumentation_test_apk("chrome_public_test_apk") {
android_library("chrome_sync_shell_test_apk_java") {
testonly = true
DEPRECATED_java_in_dir = "sync_shell/javatests/src"
java_files = [
"sync_shell/javatests/src/org/chromium/chrome/browser/sync/AutofillTest.java",
"sync_shell/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java",
"sync_shell/javatests/src/org/chromium/chrome/browser/sync/FakeServerHelper.java",
"sync_shell/javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java",
"sync_shell/javatests/src/org/chromium/chrome/browser/sync/GmsCoreSyncListenerTest.java",
"sync_shell/javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java",
"sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java",
"sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java",
"sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java",
"sync_shell/javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java",
"sync_shell/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragmentTest.java",
]
deps = [
"//base:base_java",

File diff suppressed because it is too large Load Diff

@ -2239,7 +2239,7 @@ source_set("test_support_unit") {
if (is_android) {
android_library("unit_tests_java") {
DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src"
java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_apk/ChromeNativeTestApplication.java" ]
deps = [
"//base:base_java",
"//chrome/android:chrome_java",

@ -13,6 +13,6 @@ android_apk("chromedriver_webview_shell_apk") {
deps = [
":chromedriver_webview_shell_resources",
]
DEPRECATED_java_in_dir = "java/src"
java_files = [ "java/src/org/chromium/chromedriver_webview_shell/Main.java" ]
android_manifest = "java/AndroidManifest.xml"
}

@ -311,7 +311,10 @@ if (is_android) {
"//content/shell/android:content_shell_browsertests_java",
"//testing/android/native_test:native_test_java",
]
DEPRECATED_java_in_dir = "//components/test/android/browsertests_apk/src"
java_files = [
"test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsActivity.java",
"test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsApplication.java",
]
}
jinja_template("components_browsertests_manifest") {

@ -25,7 +25,7 @@ android_library("bookmarks_java") {
"//base:base_java",
]
srcjar_deps = [ ":bookmark_type_javagen" ]
DEPRECATED_java_in_dir = "java/src"
java_files = [ "java/src/org/chromium/components/bookmarks/BookmarkId.java" ]
}
# GYP: //components/bookmarks.gyp:bookmarks_jni_headers

@ -245,7 +245,33 @@ shared_library("cronet") {
# cronet_api.jar defines Cronet API and provides implementation of
# legacy api using HttpUrlConnection (not the Chromium stack).
android_library("cronet_api") {
DEPRECATED_java_in_dir = "api/src"
java_files = [
"api/src/org/chromium/net/BidirectionalStream.java",
"api/src/org/chromium/net/ChunkedWritableByteChannel.java",
"api/src/org/chromium/net/CronetEngine.java",
"api/src/org/chromium/net/CronetException.java",
"api/src/org/chromium/net/HttpUrlConnectionUrlRequest.java",
"api/src/org/chromium/net/HttpUrlConnectionUrlRequestFactory.java",
"api/src/org/chromium/net/HttpUrlRequest.java",
"api/src/org/chromium/net/HttpUrlRequestFactory.java",
"api/src/org/chromium/net/HttpUrlRequestFactoryConfig.java",
"api/src/org/chromium/net/HttpUrlRequestListener.java",
"api/src/org/chromium/net/InputStreamChannel.java",
"api/src/org/chromium/net/JavaCronetEngine.java",
"api/src/org/chromium/net/JavaUrlRequest.java",
"api/src/org/chromium/net/NetworkQualityRttListener.java",
"api/src/org/chromium/net/NetworkQualityThroughputListener.java",
"api/src/org/chromium/net/Preconditions.java",
"api/src/org/chromium/net/ResponseTooLargeException.java",
"api/src/org/chromium/net/UploadDataProvider.java",
"api/src/org/chromium/net/UploadDataProviders.java",
"api/src/org/chromium/net/UploadDataSink.java",
"api/src/org/chromium/net/UrlRequest.java",
"api/src/org/chromium/net/UrlRequestContextConfig.java",
"api/src/org/chromium/net/UrlRequestException.java",
"api/src/org/chromium/net/UrlResponseInfo.java",
"api/src/org/chromium/net/UserAgent.java",
]
deps = [
"//third_party/android_tools:android_support_annotations_javalib",
@ -305,7 +331,10 @@ android_resources("cronet_sample_apk_resources") {
}
android_library("cronet_sample_apk_java") {
DEPRECATED_java_in_dir = "sample/src"
java_files = [
"sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java",
"sample/src/org/chromium/cronet_sample_apk/CronetSampleApplication.java",
]
deps = [
":cronet_api",
@ -353,7 +382,10 @@ instrumentation_test_apk("cronet_sample_test_apk") {
apk_name = "CronetSampleTest"
apk_under_test = ":cronet_sample_apk"
android_manifest = "sample/javatests/AndroidManifest.xml"
DEPRECATED_java_in_dir = "sample/javatests/src"
java_files = [
"sample/javatests/src/org/chromium/cronet_sample_apk/Criteria.java",
"sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java",
]
deps = [
":cronet_api",

@ -23,5 +23,10 @@ android_library("gcm_driver_java") {
"//third_party/jsr-305:jsr_305_javalib",
]
DEPRECATED_java_in_dir = "java/src"
java_files = [
"java/src/org/chromium/components/gcm_driver/FakeGoogleCloudMessagingSubscriber.java",
"java/src/org/chromium/components/gcm_driver/GCMDriver.java",
"java/src/org/chromium/components/gcm_driver/GoogleCloudMessagingSubscriber.java",
"java/src/org/chromium/components/gcm_driver/GoogleCloudMessagingV2.java",
]
}

@ -213,7 +213,11 @@ if (is_android) {
"//third_party/cacheinvalidation:cacheinvalidation_proto_java",
"//third_party/jsr-305:jsr_305_javalib",
]
DEPRECATED_java_in_dir = "android/java/src"
java_files = [
"android/java/src/org/chromium/components/invalidation/InvalidationClientService.java",
"android/java/src/org/chromium/components/invalidation/InvalidationService.java",
"android/java/src/org/chromium/components/invalidation/PendingInvalidation.java",
]
}
proto_java_library("proto_java") {
proto_path = "android/proto"
@ -230,7 +234,10 @@ if (is_android) {
"//third_party/cacheinvalidation:cacheinvalidation_javalib",
"//third_party/cacheinvalidation:cacheinvalidation_proto_java",
]
DEPRECATED_java_in_dir = "android/javatests/src"
java_files = [
"android/javatests/src/org/chromium/components/invalidation/InvalidationClientServiceTest.java",
"android/javatests/src/org/chromium/components/invalidation/TestableInvalidationClientService.java",
]
}
junit_binary("components_invalidation_impl_junit_tests") {
java_files = [ "android/junit/src/org/chromium/components/invalidation/PendingInvalidationTest.java" ]

@ -8,5 +8,8 @@ android_library("navigation_interception_java") {
deps = [
"//base:base_java",
]
DEPRECATED_java_in_dir = "java/src"
java_files = [
"java/src/org/chromium/components/navigation_interception/InterceptNavigationDelegate.java",
"java/src/org/chromium/components/navigation_interception/NavigationParams.java",
]
}

@ -9,7 +9,11 @@ android_library("precache_java") {
deps = [
"//base:base_java",
]
DEPRECATED_java_in_dir = "java/src"
java_files = [
"java/src/org/chromium/components/precache/DeviceState.java",
"java/src/org/chromium/components/precache/NetworkInfoDelegate.java",
"java/src/org/chromium/components/precache/NetworkInfoDelegateFactory.java",
]
}
android_library("precache_javatests") {
@ -17,5 +21,8 @@ android_library("precache_javatests") {
":precache_java",
"//base:base_java_test_support",
]
DEPRECATED_java_in_dir = "javatests/src"
java_files = [
"javatests/src/org/chromium/components/precache/DeviceStateTest.java",
"javatests/src/org/chromium/components/precache/MockDeviceState.java",
]
}

@ -26,7 +26,7 @@ android_library("service_tab_launcher_java") {
"//base:base_java",
"//content/public/android:content_java",
]
DEPRECATED_java_in_dir = "android/java/src"
java_files = [ "android/java/src/org/chromium/components/service_tab_launcher/ServiceTabLauncher.java" ]
}
# GYP: //components/service_tab_launcher:service_tab_launcher_jni_headers

@ -19,5 +19,6 @@ android_library("java") {
"//sync/android:sync_java",
]
DEPRECATED_java_in_dir = "java/src"
java_files =
[ "java/src/org/chromium/components/signin/ChildAccountInfoFetcher.java" ]
}

@ -9,5 +9,10 @@ android_library("variations_java") {
deps = [
"//base:base_java",
]
DEPRECATED_java_in_dir = "java/src"
java_files = [
"java/src/org/chromium/components/variations/VariationsAssociatedData.java",
"java/src/org/chromium/components/variations/firstrun/VariationsSeedBridge.java",
"java/src/org/chromium/components/variations/firstrun/VariationsSeedService.java",
"java/src/org/chromium/components/variations/firstrun/VariationsSeedServiceLauncher.java",
]
}

@ -46,7 +46,11 @@ android_library("web_contents_delegate_android_java") {
"//content/public/android:content_java_resources",
"//ui/android:ui_java",
]
DEPRECATED_java_in_dir = "android/java/src"
java_files = [
"android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java",
"android/java/src/org/chromium/components/web_contents_delegate_android/ValidationMessageBubble.java",
"android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java",
]
}
# GYP: //components/web_contents_delegate_android:web_contents_delegate_android_jni_headers

@ -62,7 +62,151 @@ android_library("content_java") {
"//ui/touch_selection:ui_touch_handle_orientation_srcjar",
]
DEPRECATED_java_in_dir = "java/src"
java_files = [
"java/src/org/chromium/content/app/ChildProcessService.java",
"java/src/org/chromium/content/app/ChromiumLinkerParams.java",
"java/src/org/chromium/content/app/ContentApplication.java",
"java/src/org/chromium/content/app/ContentMain.java",
"java/src/org/chromium/content/app/DownloadProcessService.java",
"java/src/org/chromium/content/app/PrivilegedProcessService.java",
"java/src/org/chromium/content/app/PrivilegedProcessService0.java",
"java/src/org/chromium/content/app/PrivilegedProcessService1.java",
"java/src/org/chromium/content/app/PrivilegedProcessService2.java",
"java/src/org/chromium/content/app/SandboxedProcessService.java",
"java/src/org/chromium/content/app/SandboxedProcessService0.java",
"java/src/org/chromium/content/app/SandboxedProcessService1.java",
"java/src/org/chromium/content/app/SandboxedProcessService10.java",
"java/src/org/chromium/content/app/SandboxedProcessService11.java",
"java/src/org/chromium/content/app/SandboxedProcessService12.java",
"java/src/org/chromium/content/app/SandboxedProcessService13.java",
"java/src/org/chromium/content/app/SandboxedProcessService14.java",
"java/src/org/chromium/content/app/SandboxedProcessService15.java",
"java/src/org/chromium/content/app/SandboxedProcessService16.java",
"java/src/org/chromium/content/app/SandboxedProcessService17.java",
"java/src/org/chromium/content/app/SandboxedProcessService18.java",
"java/src/org/chromium/content/app/SandboxedProcessService19.java",
"java/src/org/chromium/content/app/SandboxedProcessService2.java",
"java/src/org/chromium/content/app/SandboxedProcessService3.java",
"java/src/org/chromium/content/app/SandboxedProcessService4.java",
"java/src/org/chromium/content/app/SandboxedProcessService5.java",
"java/src/org/chromium/content/app/SandboxedProcessService6.java",
"java/src/org/chromium/content/app/SandboxedProcessService7.java",
"java/src/org/chromium/content/app/SandboxedProcessService8.java",
"java/src/org/chromium/content/app/SandboxedProcessService9.java",
"java/src/org/chromium/content/browser/ActivityContentVideoViewEmbedder.java",
"java/src/org/chromium/content/browser/BackgroundSyncNetworkObserver.java",
"java/src/org/chromium/content/browser/BindingManager.java",
"java/src/org/chromium/content/browser/BindingManagerImpl.java",
"java/src/org/chromium/content/browser/BrowserStartupController.java",
"java/src/org/chromium/content/browser/ChildProcessConnection.java",
"java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java",
"java/src/org/chromium/content/browser/ChildProcessConstants.java",
"java/src/org/chromium/content/browser/ChildProcessLauncher.java",
"java/src/org/chromium/content/browser/ContainerViewObserver.java",
"java/src/org/chromium/content/browser/ContentVideoView.java",
"java/src/org/chromium/content/browser/ContentVideoViewEmbedder.java",
"java/src/org/chromium/content/browser/ContentView.java",
"java/src/org/chromium/content/browser/ContentViewClient.java",
"java/src/org/chromium/content/browser/ContentViewCore.java",
"java/src/org/chromium/content/browser/ContentViewDownloadDelegate.java",
"java/src/org/chromium/content/browser/ContentViewRenderView.java",
"java/src/org/chromium/content/browser/ContentViewStatics.java",
"java/src/org/chromium/content/browser/ContextualSearchClient.java",
"java/src/org/chromium/content/browser/DeviceSensors.java",
"java/src/org/chromium/content/browser/DeviceUtils.java",
"java/src/org/chromium/content/browser/DownloadController.java",
"java/src/org/chromium/content/browser/DownloadInfo.java",
"java/src/org/chromium/content/browser/FileDescriptorInfo.java",
"java/src/org/chromium/content/browser/FloatingWebActionModeCallback.java",
"java/src/org/chromium/content/browser/InterstitialPageDelegateAndroid.java",
"java/src/org/chromium/content/browser/JavascriptInterface.java",
"java/src/org/chromium/content/browser/LocationProviderAdapter.java",
"java/src/org/chromium/content/browser/LocationProviderFactory.java",
"java/src/org/chromium/content/browser/MediaResourceGetter.java",
"java/src/org/chromium/content/browser/MediaSessionDelegate.java",
"java/src/org/chromium/content/browser/MediaThrottler.java",
"java/src/org/chromium/content/browser/MotionEventSynthesizer.java",
"java/src/org/chromium/content/browser/OverscrollRefreshHandler.java",
"java/src/org/chromium/content/browser/PepperPluginManager.java",
"java/src/org/chromium/content/browser/PopupZoomer.java",
"java/src/org/chromium/content/browser/PositionObserver.java",
"java/src/org/chromium/content/browser/PowerSaveBlocker.java",
"java/src/org/chromium/content/browser/RenderCoordinates.java",
"java/src/org/chromium/content/browser/SPenSupport.java",
"java/src/org/chromium/content/browser/ScreenOrientationListener.java",
"java/src/org/chromium/content/browser/ScreenOrientationProvider.java",
"java/src/org/chromium/content/browser/ServiceRegistrar.java",
"java/src/org/chromium/content/browser/ServiceRegistry.java",
"java/src/org/chromium/content/browser/SmartClipProvider.java",
"java/src/org/chromium/content/browser/SpeechRecognition.java",
"java/src/org/chromium/content/browser/TimeZoneMonitor.java",
"java/src/org/chromium/content/browser/TracingControllerAndroid.java",
"java/src/org/chromium/content/browser/ViewPositionObserver.java",
"java/src/org/chromium/content/browser/WebActionMode.java",
"java/src/org/chromium/content/browser/WebActionModeCallback.java",
"java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java",
"java/src/org/chromium/content/browser/accessibility/KitKatBrowserAccessibilityManager.java",
"java/src/org/chromium/content/browser/accessibility/LollipopBrowserAccessibilityManager.java",
"java/src/org/chromium/content/browser/accessibility/captioning/CaptioningBridgeFactory.java",
"java/src/org/chromium/content/browser/accessibility/captioning/CaptioningChangeDelegate.java",
"java/src/org/chromium/content/browser/accessibility/captioning/CaptioningStyle.java",
"java/src/org/chromium/content/browser/accessibility/captioning/EmptyCaptioningBridge.java",
"java/src/org/chromium/content/browser/accessibility/captioning/KitKatCaptioningBridge.java",
"java/src/org/chromium/content/browser/accessibility/captioning/SystemCaptioningBridge.java",
"java/src/org/chromium/content/browser/accessibility/captioning/TextTrackSettings.java",
"java/src/org/chromium/content/browser/crypto/ByteArrayGenerator.java",
"java/src/org/chromium/content/browser/crypto/CipherFactory.java",
"java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java",
"java/src/org/chromium/content/browser/input/AnimationIntervalProvider.java",
"java/src/org/chromium/content/browser/input/CardboardVRDevice.java",
"java/src/org/chromium/content/browser/input/ChromiumBaseInputConnection.java",
"java/src/org/chromium/content/browser/input/CursorAnchorInfoController.java",
"java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java",
"java/src/org/chromium/content/browser/input/FloatingPastePopupMenu.java",
"java/src/org/chromium/content/browser/input/GamepadDevice.java",
"java/src/org/chromium/content/browser/input/GamepadList.java",
"java/src/org/chromium/content/browser/input/GamepadMappings.java",
"java/src/org/chromium/content/browser/input/HandleViewResources.java",
"java/src/org/chromium/content/browser/input/ImeAdapter.java",
"java/src/org/chromium/content/browser/input/ImeUtils.java",
"java/src/org/chromium/content/browser/input/InputMethodManagerWrapper.java",
"java/src/org/chromium/content/browser/input/InputMethodUma.java",
"java/src/org/chromium/content/browser/input/JoystickScrollProvider.java",
"java/src/org/chromium/content/browser/input/JoystickZoomProvider.java",
"java/src/org/chromium/content/browser/input/LegacyPastePopupMenu.java",
"java/src/org/chromium/content/browser/input/PastePopupMenu.java",
"java/src/org/chromium/content/browser/input/PopupTouchHandleDrawable.java",
"java/src/org/chromium/content/browser/input/Range.java",
"java/src/org/chromium/content/browser/input/ReplicaInputConnection.java",
"java/src/org/chromium/content/browser/input/SelectPopup.java",
"java/src/org/chromium/content/browser/input/SelectPopupAdapter.java",
"java/src/org/chromium/content/browser/input/SelectPopupDialog.java",
"java/src/org/chromium/content/browser/input/SelectPopupDropdown.java",
"java/src/org/chromium/content/browser/input/SelectPopupItem.java",
"java/src/org/chromium/content/browser/input/TextInputState.java",
"java/src/org/chromium/content/browser/input/ThreadedInputConnection.java",
"java/src/org/chromium/content/browser/input/ThreadedInputConnectionFactory.java",
"java/src/org/chromium/content/browser/input/ThreadedInputConnectionProxyView.java",
"java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java",
"java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java",
"java/src/org/chromium/content/common/CleanupReference.java",
"java/src/org/chromium/content/common/ContentSwitches.java",
"java/src/org/chromium/content/common/SurfaceWrapper.java",
"java/src/org/chromium/content_public/browser/AccessibilitySnapshotCallback.java",
"java/src/org/chromium/content_public/browser/AccessibilitySnapshotNode.java",
"java/src/org/chromium/content_public/browser/ContentBitmapCallback.java",
"java/src/org/chromium/content_public/browser/GestureStateListener.java",
"java/src/org/chromium/content_public/browser/JavaScriptCallback.java",
"java/src/org/chromium/content_public/browser/LoadUrlParams.java",
"java/src/org/chromium/content_public/browser/NavigationController.java",
"java/src/org/chromium/content_public/browser/NavigationEntry.java",
"java/src/org/chromium/content_public/browser/NavigationHistory.java",
"java/src/org/chromium/content_public/browser/WebContents.java",
"java/src/org/chromium/content_public/browser/WebContentsObserver.java",
"java/src/org/chromium/content_public/common/MediaMetadata.java",
"java/src/org/chromium/content_public/common/Referrer.java",
"java/src/org/chromium/content_public/common/ScreenOrientationConstants.java",
]
if (enable_webvr) {
deps += [ "//third_party/cardboard-java:cardboard-java" ]
@ -190,7 +334,65 @@ android_library("content_javatests") {
"//ui/android:ui_java",
]
DEPRECATED_java_in_dir = "javatests/src"
java_files = [
"javatests/src/org/chromium/content/browser/AddressDetectionTest.java",
"javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java",
"javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java",
"javatests/src/org/chromium/content/browser/ClickListenerTest.java",
"javatests/src/org/chromium/content/browser/ClipboardTest.java",
"javatests/src/org/chromium/content/browser/ContentCommandLineTest.java",
"javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java",
"javatests/src/org/chromium/content/browser/ContentViewCoreFocusTest.java",
"javatests/src/org/chromium/content/browser/ContentViewCoreSelectionTest.java",
"javatests/src/org/chromium/content/browser/ContentViewCoreViewAndroidDelegateTest.java",
"javatests/src/org/chromium/content/browser/ContentViewLocationTest.java",
"javatests/src/org/chromium/content/browser/ContentViewPopupZoomerTest.java",
"javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java",
"javatests/src/org/chromium/content/browser/ContentViewZoomingTest.java",
"javatests/src/org/chromium/content/browser/DeviceSensorsTest.java",
"javatests/src/org/chromium/content/browser/DownloadInfoTest.java",
"javatests/src/org/chromium/content/browser/EmailAddressDetectionTest.java",
"javatests/src/org/chromium/content/browser/EncodeHtmlDataUriTest.java",
"javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java",
"javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.java",
"javatests/src/org/chromium/content/browser/InterstitialPageTest.java",
"javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java",
"javatests/src/org/chromium/content/browser/JavaBridgeArrayTest.java",
"javatests/src/org/chromium/content/browser/JavaBridgeBareboneTest.java",
"javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java",
"javatests/src/org/chromium/content/browser/JavaBridgeChildFrameTest.java",
"javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java",
"javatests/src/org/chromium/content/browser/JavaBridgeFieldsTest.java",
"javatests/src/org/chromium/content/browser/JavaBridgeReturnValuesTest.java",
"javatests/src/org/chromium/content/browser/JavaBridgeTestBase.java",
"javatests/src/org/chromium/content/browser/LocationProviderTest.java",
"javatests/src/org/chromium/content/browser/MediaResourceGetterTest.java",
"javatests/src/org/chromium/content/browser/MediaSessionTest.java",
"javatests/src/org/chromium/content/browser/NavigationTest.java",
"javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java",
"javatests/src/org/chromium/content/browser/PopupZoomerTest.java",
"javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java",
"javatests/src/org/chromium/content/browser/ScreenOrientationProviderTest.java",
"javatests/src/org/chromium/content/browser/ServiceRegistryTest.java",
"javatests/src/org/chromium/content/browser/TestsJavaScriptEvalTest.java",
"javatests/src/org/chromium/content/browser/TracingControllerAndroidTest.java",
"javatests/src/org/chromium/content/browser/VSyncMonitorTest.java",
"javatests/src/org/chromium/content/browser/VibrationManagerImplTest.java",
"javatests/src/org/chromium/content/browser/ViewportTest.java",
"javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java",
"javatests/src/org/chromium/content/browser/accessibility/captioning/CaptioningChangeDelegateTest.java",
"javatests/src/org/chromium/content/browser/crypto/CipherFactoryTest.java",
"javatests/src/org/chromium/content/browser/input/CursorAnchorInfoControllerTest.java",
"javatests/src/org/chromium/content/browser/input/ImeLollipopTest.java",
"javatests/src/org/chromium/content/browser/input/ImeTest.java",
"javatests/src/org/chromium/content/browser/input/ImeTestUtils.java",
"javatests/src/org/chromium/content/browser/input/InputDialogContainerTest.java",
"javatests/src/org/chromium/content/browser/input/ReplicaInputConnectionTest.java",
"javatests/src/org/chromium/content/browser/input/SelectPopupTest.java",
"javatests/src/org/chromium/content/browser/input/TestImeAdapterDelegate.java",
"javatests/src/org/chromium/content/browser/webcontents/WebContentsTest.java",
"javatests/src/org/chromium/content/common/CleanupReferenceTest.java",
]
}
# GYP: //content/content_tests.gypi:content_junit_tests

@ -16,5 +16,28 @@ android_library("content_java_test_support") {
"//base:base_java_test_support",
"//content/public/android:content_java",
]
DEPRECATED_java_in_dir = "javatests/src"
java_files = [
"javatests/src/org/chromium/content/browser/test/NativeLibraryTestBase.java",
"javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java",
"javatests/src/org/chromium/content/browser/test/util/ApplicationUtils.java",
"javatests/src/org/chromium/content/browser/test/util/CallbackHelper.java",
"javatests/src/org/chromium/content/browser/test/util/Criteria.java",
"javatests/src/org/chromium/content/browser/test/util/CriteriaHelper.java",
"javatests/src/org/chromium/content/browser/test/util/DOMUtils.java",
"javatests/src/org/chromium/content/browser/test/util/EqualityCriteria.java",
"javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java",
"javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java",
"javatests/src/org/chromium/content/browser/test/util/KeyUtils.java",
"javatests/src/org/chromium/content/browser/test/util/MockLocationProvider.java",
"javatests/src/org/chromium/content/browser/test/util/MockOrientationObserver.java",
"javatests/src/org/chromium/content/browser/test/util/OrientationChangeObserverCriteria.java",
"javatests/src/org/chromium/content/browser/test/util/RenderProcessLimit.java",
"javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java",
"javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java",
"javatests/src/org/chromium/content/browser/test/util/TestInputMethodManagerWrapper.java",
"javatests/src/org/chromium/content/browser/test/util/TestTouchUtils.java",
"javatests/src/org/chromium/content/browser/test/util/TestWebContentsObserver.java",
"javatests/src/org/chromium/content/browser/test/util/TouchCommon.java",
"javatests/src/org/chromium/content/browser/test/util/UiUtils.java",
]
}

@ -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" ]
}

@ -297,7 +297,10 @@ if (is_android) {
android_library("content_browsertests_java") {
testonly = true
DEPRECATED_java_in_dir = "//content/shell/android/browsertests_apk/src"
java_files = [
"../shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java",
"../shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsApplication.java",
]
deps = [
":content_browsertests_resources",
"//base:base_java",

@ -126,5 +126,13 @@ android_library("media_java") {
"//base:base_java",
]
DEPRECATED_java_in_dir = "java/src"
java_files = [
"java/src/org/chromium/media/AudioManagerAndroid.java",
"java/src/org/chromium/media/AudioRecordInput.java",
"java/src/org/chromium/media/MediaCodecBridge.java",
"java/src/org/chromium/media/MediaCodecUtil.java",
"java/src/org/chromium/media/MediaDrmBridge.java",
"java/src/org/chromium/media/MediaPlayerBridge.java",
"java/src/org/chromium/media/MediaPlayerListener.java",
]
}

@ -46,5 +46,13 @@ android_library("capture_java") {
srcjar_deps = [ ":media_java_enums_srcjar" ]
DEPRECATED_java_in_dir = "java/src"
java_files = [
"java/src/org/chromium/media/VideoCapture.java",
"java/src/org/chromium/media/VideoCaptureAndroid.java",
"java/src/org/chromium/media/VideoCaptureCamera.java",
"java/src/org/chromium/media/VideoCaptureCamera2.java",
"java/src/org/chromium/media/VideoCaptureFactory.java",
"java/src/org/chromium/media/VideoCaptureFormat.java",
"java/src/org/chromium/media/VideoCaptureTango.java",
]
}

@ -49,7 +49,14 @@ if (is_android) {
"//base:base_java",
]
DEPRECATED_java_in_dir = "java/src"
java_files = [
"java/src/org/chromium/media/midi/MidiDeviceAndroid.java",
"java/src/org/chromium/media/midi/MidiInputPortAndroid.java",
"java/src/org/chromium/media/midi/MidiManagerAndroid.java",
"java/src/org/chromium/media/midi/MidiOutputPortAndroid.java",
"java/src/org/chromium/media/midi/UsbMidiDeviceAndroid.java",
"java/src/org/chromium/media/midi/UsbMidiDeviceFactoryAndroid.java",
]
}
generate_jni("midi_jni_headers") {

@ -6,7 +6,22 @@ import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
android_library("net_java") {
DEPRECATED_java_in_dir = "java/src"
java_files = [
"java/src/org/chromium/net/AndroidCertVerifyResult.java",
"java/src/org/chromium/net/AndroidKeyStore.java",
"java/src/org/chromium/net/AndroidNetworkLibrary.java",
"java/src/org/chromium/net/AndroidTrafficStats.java",
"java/src/org/chromium/net/GURLUtils.java",
"java/src/org/chromium/net/HttpNegotiateAuthenticator.java",
"java/src/org/chromium/net/HttpNegotiateConstants.java",
"java/src/org/chromium/net/NetStringUtil.java",
"java/src/org/chromium/net/NetworkChangeNotifier.java",
"java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java",
"java/src/org/chromium/net/ProxyChangeListener.java",
"java/src/org/chromium/net/RegistrationPolicyAlwaysRegister.java",
"java/src/org/chromium/net/RegistrationPolicyApplicationStatus.java",
"java/src/org/chromium/net/X509Util.java",
]
deps = [
"//base:base_java",
]
@ -25,7 +40,21 @@ android_aidl("embedded_test_server_aidl") {
android_library("net_java_test_support") {
testonly = true
DEPRECATED_java_in_dir = "../test/android/javatests/src"
java_files = [
"../test/android/javatests/src/org/chromium/net/test/BaseHttpTestServer.java",
"../test/android/javatests/src/org/chromium/net/test/BaseTcpTestServer.java",
"../test/android/javatests/src/org/chromium/net/test/BaseTestServer.java",
"../test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java",
"../test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticatorService.java",
"../test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java",
"../test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java",
"../test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerService.java",
"../test/android/javatests/src/org/chromium/net/test/TestServerBuilder.java",
"../test/android/javatests/src/org/chromium/net/test/TestServerSpawner.java",
"../test/android/javatests/src/org/chromium/net/test/util/CertTestUtil.java",
"../test/android/javatests/src/org/chromium/net/test/util/NetworkChangeNotifierTestUtil.java",
"../test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java",
]
deps = [
":net_java",
"//base:base_java",
@ -83,7 +112,13 @@ android_resources("net_unittests_apk_resources") {
android_library("net_javatests") {
testonly = true
DEPRECATED_java_in_dir = "javatests/src"
java_files = [
"javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
"javatests/src/org/chromium/net/AndroidProxySelectorTest.java",
"javatests/src/org/chromium/net/NetErrorsTest.java",
"javatests/src/org/chromium/net/NetworkChangeNotifierTest.java",
"javatests/src/org/chromium/net/X509UtilTest.java",
]
deps = [
":net_java",
":net_java_test_support",

@ -277,6 +277,15 @@ if (is_android) {
deps = [
"//base:base_java",
]
DEPRECATED_java_in_dir = "android/java/src"
java_files = [
"android/java/src/org/chromium/printing/PrintDocumentAdapterWrapper.java",
"android/java/src/org/chromium/printing/PrintManagerDelegate.java",
"android/java/src/org/chromium/printing/PrintManagerDelegateImpl.java",
"android/java/src/org/chromium/printing/Printable.java",
"android/java/src/org/chromium/printing/PrintingContext.java",
"android/java/src/org/chromium/printing/PrintingContextInterface.java",
"android/java/src/org/chromium/printing/PrintingController.java",
"android/java/src/org/chromium/printing/PrintingControllerImpl.java",
]
}
}

@ -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

@ -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

@ -44,7 +44,12 @@ android_library("native_test_java") {
"//testing/android/reporter:reporter_java",
]
srcjar_deps = [ "//base:base_native_libraries_gen" ]
DEPRECATED_java_in_dir = "java/src"
java_files = [
"java/src/org/chromium/native_test/NativeBrowserTestActivity.java",
"java/src/org/chromium/native_test/NativeTestActivity.java",
"java/src/org/chromium/native_test/NativeTestInstrumentationTestRunner.java",
"java/src/org/chromium/native_test/NativeUnitTestActivity.java",
]
jar_excluded_patterns = [ "*/NativeLibraries.class" ]
}

@ -12,7 +12,16 @@ android_resources("android_data_chart_java_resources") {
}
android_library("android_data_chart_java") {
DEPRECATED_java_in_dir = "java/src"
java_files = [
"java/src/org/chromium/third_party/android/datausagechart/ChartAxis.java",
"java/src/org/chromium/third_party/android/datausagechart/ChartDataUsageView.java",
"java/src/org/chromium/third_party/android/datausagechart/ChartGridView.java",
"java/src/org/chromium/third_party/android/datausagechart/ChartNetworkSeriesView.java",
"java/src/org/chromium/third_party/android/datausagechart/ChartView.java",
"java/src/org/chromium/third_party/android/datausagechart/InvertedChartAxis.java",
"java/src/org/chromium/third_party/android/datausagechart/NetworkStats.java",
"java/src/org/chromium/third_party/android/datausagechart/NetworkStatsHistory.java",
]
deps = [
":android_data_chart_java_resources",
]

@ -16,7 +16,8 @@ android_resources("android_media_resources") {
}
android_library("android_media_java") {
DEPRECATED_java_in_dir = "java/src"
java_files =
[ "java/src/org/chromium/third_party/android/media/MediaController.java" ]
deps = [
":android_media_resources",
"//third_party/android_tools:android_support_v13_java",

@ -7,7 +7,11 @@ import("//build/config/android/rules.gni")
assert(is_android)
android_library("android_swipe_refresh_java") {
DEPRECATED_java_in_dir = "java/src"
java_files = [
"java/src/org/chromium/third_party/android/swiperefresh/CircleImageView.java",
"java/src/org/chromium/third_party/android/swiperefresh/MaterialProgressDrawable.java",
"java/src/org/chromium/third_party/android/swiperefresh/SwipeRefreshLayout.java",
]
deps = [
"//third_party/android_tools:android_support_v13_java",
]

@ -144,6 +144,101 @@ if (is_android) {
google_play_services_library,
]
DEPRECATED_java_in_dir = "src/java"
java_files = [
"src/java/com/google/ipc/invalidation/common/BaseCommonInvalidationConstants.java",
"src/java/com/google/ipc/invalidation/common/BuildConstants.java",
"src/java/com/google/ipc/invalidation/common/DigestFunction.java",
"src/java/com/google/ipc/invalidation/common/GcmSharedConstants.java",
"src/java/com/google/ipc/invalidation/common/ObjectIdDigestUtils.java",
"src/java/com/google/ipc/invalidation/external/client/InvalidationClient.java",
"src/java/com/google/ipc/invalidation/external/client/InvalidationClientConfig.java",
"src/java/com/google/ipc/invalidation/external/client/InvalidationClientFactory.java",
"src/java/com/google/ipc/invalidation/external/client/InvalidationListener.java",
"src/java/com/google/ipc/invalidation/external/client/SystemResources.java",
"src/java/com/google/ipc/invalidation/external/client/SystemResourcesBuilder.java",
"src/java/com/google/ipc/invalidation/external/client/android/service/AndroidLogger.java",
"src/java/com/google/ipc/invalidation/external/client/android2/AndroidClientFactory.java",
"src/java/com/google/ipc/invalidation/external/client/contrib/AndroidListener.java",
"src/java/com/google/ipc/invalidation/external/client/contrib/AndroidListenerIntents.java",
"src/java/com/google/ipc/invalidation/external/client/contrib/AndroidListenerProtos.java",
"src/java/com/google/ipc/invalidation/external/client/contrib/AndroidListenerState.java",
"src/java/com/google/ipc/invalidation/external/client/contrib/MultiplexingGcmListener.java",
"src/java/com/google/ipc/invalidation/external/client/types/AckHandle.java",
"src/java/com/google/ipc/invalidation/external/client/types/ApplicationClientId.java",
"src/java/com/google/ipc/invalidation/external/client/types/BytesFormatter.java",
"src/java/com/google/ipc/invalidation/external/client/types/Callback.java",
"src/java/com/google/ipc/invalidation/external/client/types/ErrorContext.java",
"src/java/com/google/ipc/invalidation/external/client/types/ErrorInfo.java",
"src/java/com/google/ipc/invalidation/external/client/types/Invalidation.java",
"src/java/com/google/ipc/invalidation/external/client/types/ObjectId.java",
"src/java/com/google/ipc/invalidation/external/client/types/SimplePair.java",
"src/java/com/google/ipc/invalidation/external/client/types/Status.java",
"src/java/com/google/ipc/invalidation/ticl/AckCache.java",
"src/java/com/google/ipc/invalidation/ticl/BasicSystemResources.java",
"src/java/com/google/ipc/invalidation/ticl/CheckingInvalidationListener.java",
"src/java/com/google/ipc/invalidation/ticl/DigestStore.java",
"src/java/com/google/ipc/invalidation/ticl/InvalidationClientCore.java",
"src/java/com/google/ipc/invalidation/ticl/InvalidationClientImpl.java",
"src/java/com/google/ipc/invalidation/ticl/MemoryStorageImpl.java",
"src/java/com/google/ipc/invalidation/ticl/PersistenceUtils.java",
"src/java/com/google/ipc/invalidation/ticl/ProtoWrapperConverter.java",
"src/java/com/google/ipc/invalidation/ticl/ProtocolHandler.java",
"src/java/com/google/ipc/invalidation/ticl/RecurringTask.java",
"src/java/com/google/ipc/invalidation/ticl/RegistrationManager.java",
"src/java/com/google/ipc/invalidation/ticl/RunState.java",
"src/java/com/google/ipc/invalidation/ticl/SafeStorage.java",
"src/java/com/google/ipc/invalidation/ticl/SimpleRegistrationStore.java",
"src/java/com/google/ipc/invalidation/ticl/Statistics.java",
"src/java/com/google/ipc/invalidation/ticl/TestableInvalidationClient.java",
"src/java/com/google/ipc/invalidation/ticl/TestableNetworkChannel.java",
"src/java/com/google/ipc/invalidation/ticl/TiclExponentialBackoffDelayGenerator.java",
"src/java/com/google/ipc/invalidation/ticl/android2/AndroidClock.java",
"src/java/com/google/ipc/invalidation/ticl/android2/AndroidInternalScheduler.java",
"src/java/com/google/ipc/invalidation/ticl/android2/AndroidInvalidationClientImpl.java",
"src/java/com/google/ipc/invalidation/ticl/android2/AndroidInvalidationClientStub.java",
"src/java/com/google/ipc/invalidation/ticl/android2/AndroidInvalidationListenerIntentMapper.java",
"src/java/com/google/ipc/invalidation/ticl/android2/AndroidInvalidationListenerStub.java",
"src/java/com/google/ipc/invalidation/ticl/android2/AndroidStorage.java",
"src/java/com/google/ipc/invalidation/ticl/android2/AndroidTiclManifest.java",
"src/java/com/google/ipc/invalidation/ticl/android2/ProtocolIntents.java",
"src/java/com/google/ipc/invalidation/ticl/android2/ResourcesFactory.java",
"src/java/com/google/ipc/invalidation/ticl/android2/TiclService.java",
"src/java/com/google/ipc/invalidation/ticl/android2/TiclStateManager.java",
"src/java/com/google/ipc/invalidation/ticl/android2/WakeLockManager.java",
"src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidChannelConstants.java",
"src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidChannelPreferences.java",
"src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidGcmController.java",
"src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidInstanceIDListenerService.java",
"src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageReceiverService.java",
"src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageSenderService.java",
"src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidNetworkChannel.java",
"src/java/com/google/ipc/invalidation/ticl/android2/channel/CommonUtils.java",
"src/java/com/google/ipc/invalidation/ticl/android2/channel/GcmRegistrationTaskService.java",
"src/java/com/google/ipc/invalidation/ticl/android2/channel/GcmUpstreamSenderService.java",
"src/java/com/google/ipc/invalidation/ticl/proto/AndroidChannel.java",
"src/java/com/google/ipc/invalidation/ticl/proto/AndroidListenerProtocol.java",
"src/java/com/google/ipc/invalidation/ticl/proto/AndroidService.java",
"src/java/com/google/ipc/invalidation/ticl/proto/ChannelCommon.java",
"src/java/com/google/ipc/invalidation/ticl/proto/Client.java",
"src/java/com/google/ipc/invalidation/ticl/proto/ClientConstants.java",
"src/java/com/google/ipc/invalidation/ticl/proto/ClientProtocol.java",
"src/java/com/google/ipc/invalidation/ticl/proto/CommonProtos.java",
"src/java/com/google/ipc/invalidation/ticl/proto/JavaClient.java",
"src/java/com/google/ipc/invalidation/util/BaseLogger.java",
"src/java/com/google/ipc/invalidation/util/Box.java",
"src/java/com/google/ipc/invalidation/util/Bytes.java",
"src/java/com/google/ipc/invalidation/util/ExponentialBackoffDelayGenerator.java",
"src/java/com/google/ipc/invalidation/util/Formatter.java",
"src/java/com/google/ipc/invalidation/util/InternalBase.java",
"src/java/com/google/ipc/invalidation/util/LazyString.java",
"src/java/com/google/ipc/invalidation/util/Marshallable.java",
"src/java/com/google/ipc/invalidation/util/NamedRunnable.java",
"src/java/com/google/ipc/invalidation/util/Preconditions.java",
"src/java/com/google/ipc/invalidation/util/ProtoWrapper.java",
"src/java/com/google/ipc/invalidation/util/Smearer.java",
"src/java/com/google/ipc/invalidation/util/TextBuilder.java",
"src/java/com/google/ipc/invalidation/util/TypedUtil.java",
"src/java/com/google/ipc/invalidation/util/UtilFormatter.java",
]
}
}

@ -11,7 +11,7 @@ android_resources("chrome_tabs_client_example_apk_resources") {
}
android_apk("custom_tabs_client_example_apk") {
DEPRECATED_java_in_dir = "src/Application/src/main/java"
java_files = [ "src/Application/src/main/java/org/chromium/customtabsclient/MainActivity.java" ]
android_manifest = "src/Application/src/main/AndroidManifest.xml"
apk_name = "CustomTabsClientExample"
deps = [
@ -23,15 +23,28 @@ android_apk("custom_tabs_client_example_apk") {
}
android_library("custom_tabs_client_shared_lib") {
DEPRECATED_java_in_dir =
"src/shared/src/main/java/org/chromium/customtabsclient/shared"
java_files = [
"src/shared/src/main/java/org/chromium/customtabsclient/shared/CustomTabsHelper.java",
"src/shared/src/main/java/org/chromium/customtabsclient/shared/KeepAliveService.java",
"src/shared/src/main/java/org/chromium/customtabsclient/shared/ServiceConnectionCallback.java",
"src/shared/src/main/java/org/chromium/customtabsclient/shared/ServiceConnection.java",
]
deps = [
":custom_tabs_support_lib",
]
}
android_library("custom_tabs_support_lib") {
DEPRECATED_java_in_dir = "src/customtabs/src"
java_files = [
"src/customtabs/src/android/support/customtabs/CustomTabsCallback.java",
"src/customtabs/src/android/support/customtabs/CustomTabsClient.java",
"src/customtabs/src/android/support/customtabs/CustomTabsIntent.java",
"src/customtabs/src/android/support/customtabs/CustomTabsService.java",
"src/customtabs/src/android/support/customtabs/CustomTabsServiceConnection.java",
"src/customtabs/src/android/support/customtabs/CustomTabsSession.java",
"src/customtabs/src/android/support/customtabs/CustomTabsSessionToken.java",
]
deps = [
"//third_party/android_tools:android_support_v13_java",
]

@ -5,7 +5,7 @@
import("//build/config/android/rules.gni")
android_apk("customtabs_benchmark_apk") {
DEPRECATED_java_in_dir = "java/src"
java_files = [ "java/src/org/chromium/customtabs/test/MainActivity.java" ]
android_manifest = "java/AndroidManifest.xml"
apk_name = "CustomTabsBenchmark"
deps = [

@ -12,7 +12,10 @@ android_resources("memconsumer_apk_resources") {
android_apk("memconsumer_apk") {
apk_name = "MemConsumer"
android_manifest = "java/AndroidManifest.xml"
DEPRECATED_java_in_dir = "java/src"
java_files = [
"java/src/org/chromium/memconsumer/MemConsumer.java",
"java/src/org/chromium/memconsumer/ResidentService.java",
]
native_libs = [ "libmemconsumer.so" ]
deps = [

@ -130,7 +130,75 @@ android_resources("ui_java_resources") {
}
android_library("ui_java") {
DEPRECATED_java_in_dir = "java/src"
java_files = [
"java/src/org/chromium/ui/ColorPickerAdvanced.java",
"java/src/org/chromium/ui/ColorPickerAdvancedComponent.java",
"java/src/org/chromium/ui/ColorPickerDialog.java",
"java/src/org/chromium/ui/ColorPickerMoreButton.java",
"java/src/org/chromium/ui/ColorPickerSimple.java",
"java/src/org/chromium/ui/ColorSuggestion.java",
"java/src/org/chromium/ui/ColorSuggestionListAdapter.java",
"java/src/org/chromium/ui/DropdownAdapter.java",
"java/src/org/chromium/ui/DropdownDividerDrawable.java",
"java/src/org/chromium/ui/DropdownItem.java",
"java/src/org/chromium/ui/DropdownPopupWindow.java",
"java/src/org/chromium/ui/OnColorChangedListener.java",
"java/src/org/chromium/ui/UiUtils.java",
"java/src/org/chromium/ui/VSyncMonitor.java",
"java/src/org/chromium/ui/autofill/AutofillDelegate.java",
"java/src/org/chromium/ui/autofill/AutofillKeyboardAccessory.java",
"java/src/org/chromium/ui/autofill/AutofillPopup.java",
"java/src/org/chromium/ui/autofill/AutofillSuggestion.java",
"java/src/org/chromium/ui/base/ActivityWindowAndroid.java",
"java/src/org/chromium/ui/base/AndroidPermissionDelegate.java",
"java/src/org/chromium/ui/base/Clipboard.java",
"java/src/org/chromium/ui/base/DeviceFormFactor.java",
"java/src/org/chromium/ui/base/LocalizationUtils.java",
"java/src/org/chromium/ui/base/ResourceBundle.java",
"java/src/org/chromium/ui/base/SelectFileDialog.java",
"java/src/org/chromium/ui/base/TouchDevice.java",
"java/src/org/chromium/ui/base/ViewAndroidDelegate.java",
"java/src/org/chromium/ui/base/WindowAndroid.java",
"java/src/org/chromium/ui/gfx/BitmapHelper.java",
"java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java",
"java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java",
"java/src/org/chromium/ui/gl/SurfaceTextureListener.java",
"java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java",
"java/src/org/chromium/ui/interpolators/BakedBezierInterpolator.java",
"java/src/org/chromium/ui/picker/ChromeDatePickerDialog.java",
"java/src/org/chromium/ui/picker/DateDialogNormalizer.java",
"java/src/org/chromium/ui/picker/DateTimePickerDialog.java",
"java/src/org/chromium/ui/picker/DateTimeSuggestion.java",
"java/src/org/chromium/ui/picker/DateTimeSuggestionListAdapter.java",
"java/src/org/chromium/ui/picker/InputDialogContainer.java",
"java/src/org/chromium/ui/picker/MonthPicker.java",
"java/src/org/chromium/ui/picker/MonthPickerDialog.java",
"java/src/org/chromium/ui/picker/MultiFieldTimePickerDialog.java",
"java/src/org/chromium/ui/picker/TwoFieldDatePicker.java",
"java/src/org/chromium/ui/picker/TwoFieldDatePickerDialog.java",
"java/src/org/chromium/ui/picker/WeekPicker.java",
"java/src/org/chromium/ui/picker/WeekPickerDialog.java",
"java/src/org/chromium/ui/resources/LayoutResource.java",
"java/src/org/chromium/ui/resources/Resource.java",
"java/src/org/chromium/ui/resources/ResourceLoader.java",
"java/src/org/chromium/ui/resources/ResourceManager.java",
"java/src/org/chromium/ui/resources/async/AsyncPreloadResourceLoader.java",
"java/src/org/chromium/ui/resources/dynamics/BitmapDynamicResource.java",
"java/src/org/chromium/ui/resources/dynamics/DynamicResource.java",
"java/src/org/chromium/ui/resources/dynamics/DynamicResourceLoader.java",
"java/src/org/chromium/ui/resources/dynamics/ViewResourceAdapter.java",
"java/src/org/chromium/ui/resources/dynamics/ViewResourceInflater.java",
"java/src/org/chromium/ui/resources/sprites/CrushedSpriteResource.java",
"java/src/org/chromium/ui/resources/sprites/CrushedSpriteResourceLoader.java",
"java/src/org/chromium/ui/resources/statics/NinePatchData.java",
"java/src/org/chromium/ui/resources/statics/StaticResource.java",
"java/src/org/chromium/ui/resources/statics/StaticResourceLoader.java",
"java/src/org/chromium/ui/resources/system/SystemResourceLoader.java",
"java/src/org/chromium/ui/text/SpanApplier.java",
"java/src/org/chromium/ui/widget/ButtonCompat.java",
"java/src/org/chromium/ui/widget/TextViewWithClickableSpans.java",
"java/src/org/chromium/ui/widget/Toast.java",
]
deps = [
":ui_java_resources",
"//base:base_java",
@ -139,7 +207,10 @@ android_library("ui_java") {
}
android_library("ui_javatests") {
DEPRECATED_java_in_dir = "javatests/src"
java_files = [
"javatests/src/org/chromium/ui/picker/DateTimePickerDialogTest.java",
"javatests/src/org/chromium/ui/resources/sprites/CrushedSpriteResourceTest.java",
]
testonly = true
deps = [
":ui_java",

@ -73,7 +73,7 @@ component("url") {
if (is_android) {
android_library("url_java") {
DEPRECATED_java_in_dir = "android/java/src"
java_files = [ "android/java/src/org/chromium/url/IDNStringUtil.java" ]
deps = [
"//base:base_java",
]