Index: base/BUILD.gn |
diff --git a/base/BUILD.gn b/base/BUILD.gn |
index b5552a671600d849889d51b0db9ab9bcb8ac87f0..ec259fd99008efd71086ab0e9888e0f5a57c925e 100644 |
--- a/base/BUILD.gn |
+++ b/base/BUILD.gn |
@@ -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 |