diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-13 15:05:36 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-14 10:33:47 +0000 |
| commit | e684a3455bcc29a6e3e66a004e352dea4e1141e7 (patch) | |
| tree | d55b4003bde34d7d05f558f02cfd82b2a66a7aac /chromium/third_party/mockito | |
| parent | 2b94bfe47ccb6c08047959d1c26e392919550e86 (diff) | |
| download | qtwebengine-chromium-e684a3455bcc29a6e3e66a004e352dea4e1141e7.tar.gz | |
BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0
Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/mockito')
| -rw-r--r-- | chromium/third_party/mockito/BUILD.gn | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/chromium/third_party/mockito/BUILD.gn b/chromium/third_party/mockito/BUILD.gn index f6e4cad027a..bb61bcbbeeb 100644 --- a/chromium/third_party/mockito/BUILD.gn +++ b/chromium/third_party/mockito/BUILD.gn @@ -7,9 +7,12 @@ import("//build/config/android/rules.gni") java_library("mockito_java") { chromium_code = false supports_android = true + requires_android = true testonly = true + proguard_configs = [ "//third_party/mockito/proguard.flags" ] deps = [ "//third_party/byte_buddy:byte_buddy_agent_java", + "//third_party/byte_buddy:byte_buddy_android_java", "//third_party/byte_buddy:byte_buddy_java", "//third_party/hamcrest:hamcrest_java", "//third_party/junit:junit", @@ -454,19 +457,6 @@ java_library("mockito_java") { "src/src/main/java/org/mockito/internal/creation/package-info.java", "src/src/main/java/org/mockito/creation/instance/InstantiationException.java", "src/src/main/java/org/mockito/creation/instance/Instantiator.java", - ] -} - -android_library("mockito_android_java") { - chromium_code = false - testonly = true - proguard_configs = [ "//third_party/mockito/proguard.flags" ] - deps = [ - ":mockito_java", - "//third_party/byte_buddy:byte_buddy_android_java", - ] - - java_files = [ "src/subprojects/android/src/main/java/org/mockito/android/internal/creation/AndroidTempFileLocator.java", "src/subprojects/android/src/main/java/org/mockito/android/internal/creation/AndroidLoadingStrategy.java", "src/subprojects/android/src/main/java/org/mockito/android/internal/creation/AndroidByteBuddyMockMaker.java", @@ -474,9 +464,7 @@ android_library("mockito_android_java") { include_java_resources = true additional_jar_files = [ [ - rebase_path( - "src/subprojects/android/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker", - root_build_dir), + "src/subprojects/android/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker", "mockito-extensions/org.mockito.plugins.MockMaker", ] ] } |