diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-02-22 13:39:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-22 13:39:10 +0000 |
| commit | 919ff2268b22e9fde5cbb08404d3a567dde86890 (patch) | |
| tree | a6bcaff6dea245ff138a402c0c9fcd78c2ff18a0 /test-base | |
| parent | 9a50d7579516ee3b877aab84f412bdd2d0fe03b4 (diff) | |
| parent | 4cdec67417f977427422b13e8218246a507cb2fc (diff) | |
Merge changes I8e432950,Id325b8cf
* changes:
Build android.test.base/legacy against SDK
Fix visibility issues with android.test.mock.stubs
Diffstat (limited to 'test-base')
| -rw-r--r-- | test-base/Android.bp | 18 | ||||
| -rw-r--r-- | test-base/Android.mk | 5 |
2 files changed, 5 insertions, 18 deletions
diff --git a/test-base/Android.bp b/test-base/Android.bp index 49122249ce25..4d149f7c8919 100644 --- a/test-base/Android.bp +++ b/test-base/Android.bp @@ -31,12 +31,8 @@ java_library { // Needs to be consistent with the repackaged version of this make target. java_version: "1.8", - no_framework_libs: true, + sdk_version: "current", hostdex: true, - libs: [ - "framework", - ], - } // Build the legacy-test library @@ -46,12 +42,9 @@ java_library { // Also contains the com.android.internal.util.Predicate[s] classes. java_library { name: "legacy-test", - static_libs: ["android.test.base"], - no_framework_libs: true, - libs: [ - "framework", - ], + sdk_version: "current", + static_libs: ["android.test.base"], } // Build the repackaged.android.test.base library @@ -61,11 +54,8 @@ java_library { java_library_static { name: "repackaged.android.test.base", + sdk_version: "current", static_libs: ["android.test.base"], - no_framework_libs: true, - libs: [ - "framework", - ], jarjar_rules: "jarjar-rules.txt", // Pin java_version until jarjar is certified to support later versions. http://b/72703434 diff --git a/test-base/Android.mk b/test-base/Android.mk index 861385467a0f..ebb33deb42d3 100644 --- a/test-base/Android.mk +++ b/test-base/Android.mk @@ -26,10 +26,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ $(call all-java-files-under, src) -LOCAL_JAVA_LIBRARIES := \ - core-oj \ - core-libart \ - framework \ +LOCAL_SDK_VERSION := current LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/src |