diff options
author | Jorge Lucangeli Obes <jorgelo@google.com> | 2016-12-28 22:32:26 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-28 22:32:26 +0000 |
commit | beb79653f9df45437fc5159dd5fa0e271498b5d0 (patch) | |
tree | 474a6982fa5078f31bfdeb96590308dc83b5187a | |
parent | 46998029d80d5e486940c3c6b641569229349641 (diff) | |
parent | 4550f5982194e197c1f5553efc8ebbf50403f050 (diff) | |
download | mtpd-beb79653f9df45437fc5159dd5fa0e271498b5d0.tar.gz |
Merge "mtpd: Convert Android.mk to Android.bp"
am: 4550f59821
Change-Id: I2c8d57fb7a46b27dfced62f6ba3b8d7c60c9c498
-rw-r--r-- | Android.bp | 29 | ||||
-rw-r--r-- | Android.mk | 27 | ||||
-rw-r--r-- | CleanSpec.mk | 49 |
3 files changed, 29 insertions, 76 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..7af119f --- /dev/null +++ b/Android.bp @@ -0,0 +1,29 @@ +// 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. + +cc_binary { + name: "mtpd", + srcs: [ + "mtpd.c", + "l2tp.c", + "pptp.c" + ], + shared_libs: [ + "libcrypto", + "libcutils", + "liblog", + ], + cflags: ["-DANDROID_CHANGES"], + init_rc: ["mtpd.rc"], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 43e9c0b..0000000 --- a/Android.mk +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (C) 2009 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_SRC_FILES := mtpd.c l2tp.c pptp.c -LOCAL_SHARED_LIBRARIES := libcutils liblog libcrypto -LOCAL_CFLAGS := -DANDROID_CHANGES - -LOCAL_MODULE := mtpd -LOCAL_INIT_RC := mtpd.rc - -include $(BUILD_EXECUTABLE) diff --git a/CleanSpec.mk b/CleanSpec.mk deleted file mode 100644 index b84e1b6..0000000 --- a/CleanSpec.mk +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright (C) 2007 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. -# - -# If you don't need to do a full clean build but would like to touch -# a file or delete some intermediate files, add a clean step to the end -# of the list. These steps will only be run once, if they haven't been -# run before. -# -# E.g.: -# $(call add-clean-step, touch -c external/sqlite/sqlite3.h) -# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates) -# -# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with -# files that are missing or have been moved. -# -# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory. -# Use $(OUT_DIR) to refer to the "out" directory. -# -# If you need to re-do something that's already mentioned, just copy -# the command and add it to the bottom of the list. E.g., if a change -# that you made last week required touching a file and a change you -# made today requires touching the same file, just copy the old -# touch step and add it to the end of the list. -# -# ************************************************ -# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST -# ************************************************ - -# For example: -#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates) -#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates) -#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f) -#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*) - -# ************************************************ -# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST -# ************************************************ |