diff options
| author | Roland Levillain <rpl@google.com> | 2019-11-15 19:27:02 +0000 |
|---|---|---|
| committer | Roland Levillain <rpl@google.com> | 2019-11-15 19:50:50 +0000 |
| commit | d38b50d216334359b9969606cc611b8be217887f (patch) | |
| tree | ac80f025bd021950081702a2ffe7b7955c9a4b4b /JavaLibrary.bp | |
| parent | c5d7d083c5848ddd9bf33b13dc2084088806f8ce (diff) | |
Revert submission from topic "separate-testing".
Reason for revert: Breaks master-art builds with this error:
FAILED: out/soong/.intermediates/development/build/android_stubs_current/android_common/turbine-combined/android_stubs_current.jar
echo "module android_stubs_current missing dependencies: api-stubs-docs, framework-res" && false
module android_stubs_current missing dependencies: api-stubs-docs, framework-res
Test: art/tools/buildbot-build.sh --host
Bug: 140367850
Exempt-From-Owner-Approval: Reverting change breaking ART builds
Change-Id: I48f9505342cf035822b445df0fb8b2b778ef36d4
Diffstat (limited to 'JavaLibrary.bp')
| -rw-r--r-- | JavaLibrary.bp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/JavaLibrary.bp b/JavaLibrary.bp index ec47b5aa8b..c0777ffd07 100644 --- a/JavaLibrary.bp +++ b/JavaLibrary.bp @@ -492,10 +492,8 @@ java_library_static { // Builds platform_compat test rules java_library_static { - name: "core-compat-test-rules", - visibility: [ - "//frameworks/base/tests/PlatformCompatGating/test-rules", - ], + name: "platform_compat-test-rules", + visibility: ["//visibility:public"], srcs: [ "luni/src/main/java/android/compat/**/*.java", "test-rules/src/platform_compat/**/*.java", @@ -505,13 +503,12 @@ java_library_static { static_libs: [ "junit", "guava", + "android-support-test", "app-compat-annotations", ], - sdk_version: "none", - system_modules: "core-all-system-modules", + platform_apis: true, // This builds classes that are in the java.base Java module: patch_module: "java.base", - hostdex: true, } // Builds the core-tests-support library used by various tests. @@ -609,7 +606,6 @@ java_test { static_libs: [ "archive-patcher", - "core-compat-test-rules", "core-java-9-language-tests", "core-test-rules", "core-tests-support", |