Merge "Add legacy-test as replacement for core-junit" am: e75a82a9 am: a485fa1f

LOCAL_ADDITIONAL_DEPENDENCIES := $(framework_res_R_stamp)

LOCAL_ADDITIONAL_DEPENDENCIES := $(framework_res_R_stamp)

LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_NO_STANDARD_LIBRARIES := true

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

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

LOCAL_STATIC_JAVA_LIBRARIES := framework-protos

LOCAL_STATIC_JAVA_LIBRARIES := framework-protos

LOCAL_MODULE := framework

LOCAL_MODULE := framework

#

# Copyright (C) 2016 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#

LOCAL_PATH:= $(call my-dir)

# Build the legacy-test library

# =============================

# This contains the junit.framework classes that were in Android API level 25.

include $(CLEAR_VARS)

LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_STATIC_JAVA_LIBRARIES := core-junit-static

LOCAL_MODULE := legacy-test

include $(BUILD_JAVA_LIBRARY)