diff options
author | Steve Kondik <shade@chemlab.org> | 2012-11-18 20:46:23 -0800 |
---|---|---|
committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 20:46:23 -0800 |
commit | 90b17dc3aca5efbed34a82972db73de71b724fe3 (patch) | |
tree | 9acc413d20b5520ad4f5f96786e46718d5dbb7fb /modules/nfc-nci/Android.mk | |
parent | bb992a86df645482167013634a8c1de1a3109344 (diff) | |
parent | c55d7ac337641c7ad9ff734169e65553fbb40787 (diff) | |
download | hardware_libhardware-90b17dc3aca5efbed34a82972db73de71b724fe3.zip hardware_libhardware-90b17dc3aca5efbed34a82972db73de71b724fe3.tar.gz hardware_libhardware-90b17dc3aca5efbed34a82972db73de71b724fe3.tar.bz2 |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/hardware/libhardware into HEAD
Conflicts:
include/hardware/fb.h
include/hardware/hwcomposer.h
modules/audio/audio_hw.c
Change-Id: Ib37d49cb600bf0cd062847f9c0eb3841bae13f74
Diffstat (limited to 'modules/nfc-nci/Android.mk')
-rw-r--r-- | modules/nfc-nci/Android.mk | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/modules/nfc-nci/Android.mk b/modules/nfc-nci/Android.mk new file mode 100644 index 0000000..97262ef --- /dev/null +++ b/modules/nfc-nci/Android.mk @@ -0,0 +1,25 @@ +# 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. + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE := nfc_nci.default +LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_SRC_FILES := nfc_nci_example.c +LOCAL_SHARED_LIBRARIES := liblog libcutils +LOCAL_MODULE_TAGS := optional + +include $(BUILD_SHARED_LIBRARY) |