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

Commit 0e4fc209 authored by Paul Duffin's avatar Paul Duffin Committed by android-build-merger
Browse files

Merge "Move android.test classes from core/java to legacy-test/src" am: 2761ed12 am: 28b617bd 

am: 7e28011f

Change-Id: I075483114837003014a68614ce9f55a5d199ec85
parents b28dedff 7e28011f

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ framework_res_R_stamp := \ 
LOCAL_ADDITIONAL_DEPENDENCIES := $(framework_res_R_stamp)



LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp legacy-test bouncycastle ext

LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp bouncycastle ext

LOCAL_STATIC_JAVA_LIBRARIES := framework-protos



LOCAL_MODULE := framework
@@ -729,6 +729,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-runner/src \

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

	  $(wildcard \

legacy-test/Android.mk

+4 −3
Original line number Diff line number Diff line
@@ -21,11 +21,12 @@ LOCAL_PATH:= $(call my-dir) 
# This contains the junit.framework classes that were in Android API level 25.

include $(CLEAR_VARS)



LOCAL_SRC_FILES := $(call all-java-files-under, src)

LOCAL_MODULE := legacy-test

LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core-oj core-libart framework

LOCAL_STATIC_JAVA_LIBRARIES := core-junit-static



LOCAL_MODULE := legacy-test



include $(BUILD_JAVA_LIBRARY)



ifeq ($(HOST_OS),linux)
@@ -34,7 +35,7 @@ ifeq ($(HOST_OS),linux) 
# This contains the android.test.PerformanceTestCase class only

include $(CLEAR_VARS)



LOCAL_SRC_FILES := ../core/java/android/test/PerformanceTestCase.java

LOCAL_SRC_FILES := src/android/test/PerformanceTestCase.java

LOCAL_MODULE := legacy-performance-test-hostdex



include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)