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

Commit 9361cc11 authored by android-build-team Robot's avatar android-build-team Robot Committed by android-build-merger
Browse files

Merge "resolve merge conflicts of 0eea822c to...

Merge "resolve merge conflicts of 0eea822c to pi-dev-plus-aosp" into pi-dev-plus-aosp
am: 3c06e7e9

Change-Id: Ib5ff472ded575e15e8769dbab323a69125e43d9f
parents 4347321e 3c06e7e9
Loading
Loading
Loading
Loading

nfc-extras/Android.bp

0 → 100644
+21 −0
Original line number Diff line number Diff line
//
// 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"],
}

nfc-extras/Android.mk

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)
LOCAL_MODULE := com.android.nfc_extras
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under,java)
include $(BUILD_JAVA_LIBRARY)

include $(CLEAR_VARS)
LOCAL_MODULE := com.android.nfc_extras-stubs-gen
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_SRC_FILES := $(call all-java-files-under,java)
# This is to reference SdkConstant annotation; not part of this lib.
LOCAL_DROIDDOC_SOURCE_PATH := frameworks/base/core/java/android/annotation
LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/com.android.nfc_extras.stubs_intermediates/src
LOCAL_DROIDDOC_OPTIONS:= \
    -hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 \
    -stubpackages com.android.nfc_extras \
    -nodocs
LOCAL_UNINSTALLABLE_MODULE := true
include $(BUILD_DROIDDOC)
com_android_nfc_extras_gen_stamp := $(full_target)

include $(CLEAR_VARS)
LOCAL_MODULE := com.android.nfc_extras.stubs
# This is to reference SdkConstant annotation; not part of this lib.
LOCAL_SRC_FILES := ../core/java/android/annotation/SdkConstant.java
LOCAL_SDK_VERSION := current
LOCAL_ADDITIONAL_DEPENDENCIES := $(com_android_nfc_extras_gen_stamp)
com_android_nfc_extras_gen_stamp :=
include $(BUILD_STATIC_JAVA_LIBRARY)

include $(call all-makefiles-under,$(LOCAL_PATH))
+0 −20
Original line number Diff line number Diff line
<?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>