Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 178dfc66 authored by Paul Duffin's avatar Paul Duffin Committed by Android (Google) Code Review
Browse files

Merge "Move legacy-test to test-base"

parents d5c6baad f779efd6

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -914,7 +914,7 @@ packages_to_document := \ 
# Search through the base framework dirs for these packages.

# The result will be relative to frameworks/base.

fwbase_dirs_to_document := \

	legacy-test/src \

	test-base/src \

	$(patsubst $(LOCAL_PATH)/%,%, \

	  $(wildcard \

	    $(foreach dir, $(FRAMEWORKS_BASE_JAVA_SRC_DIRS), \

legacy-test/Android.mk→test-base/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/src 
LEGACY_TEST_OUTPUT_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/legacy.test.stubs_intermediates/api.txt

LEGACY_TEST_OUTPUT_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/legacy.test.stubs_intermediates/removed.txt



LEGACY_TEST_API_FILE := $(LOCAL_PATH)/api/legacy-test-current.txt

LEGACY_TEST_REMOVED_API_FILE := $(LOCAL_PATH)/api/legacy-test-removed.txt

LEGACY_TEST_API_FILE := $(LOCAL_PATH)/api/android-test-base-current.txt

LEGACY_TEST_REMOVED_API_FILE := $(LOCAL_PATH)/api/android-test-base-removed.txt



LOCAL_DROIDDOC_OPTIONS:= \

    -stubpackages android.test:android.test.suitebuilder.annotation:com.android.internal.util:junit.framework \
@@ -119,7 +119,7 @@ $(eval $(call check-api, \ 
    -error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \

    -error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 \

    -error 25 -error 26 -error 27, \

    cat $(LOCAL_PATH)/api/apicheck_msg_legacy_test.txt, \

    cat $(LOCAL_PATH)/api/apicheck_msg_android_test_base.txt, \

    check-legacy-test-api, \

    $(call doc-timestamp-for,legacy-test-api-stubs-gen) \

    ))