Merge changes Ie4709b6e,I57980ccb

//

// Copyright (C) 2018 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.

//

java_sdk_library {

    name: "com.android.nfc_extras",

    srcs: ["java/**/*.java"],

    api_packages: ["com.android.nfc_extras"],

}

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := optional

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

LOCAL_MODULE:= com.android.nfc_extras

include $(BUILD_JAVA_LIBRARY)

include $(call all-makefiles-under,$(LOCAL_PATH))

<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 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.

-->

<permissions>

    <library name="com.android.nfc_extras"

            file="/system/framework/com.android.nfc_extras.jar" />

</permissions>

LOCAL_MODULE_TAGS := tests

LOCAL_JAVA_LIBRARIES := \

    android.test.runner \

    com.android.nfc_extras

    android.test.runner.stubs \

    com.android.nfc_extras.stubs \

    android.test.base.stubs

LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test

LOCAL_STATIC_JAVA_LIBRARIES := junit

# Include all test java files.

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