diff options
| author | Jason Monk <jmonk@google.com> | 2018-08-13 09:57:20 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-13 09:57:20 -0700 |
| commit | 5893baf4edb056622f5b043257ee201f3892a5d4 (patch) | |
| tree | f46034ebc665c6c4fc3cb7b769f8d3b5905eb6c9 | |
| parent | d4f2c08c1e2709ef83856ffe5547571e2f03080b (diff) | |
| parent | c20b4680c68ad8f966249f367d05162b72d049ff (diff) | |
| download | ims-5893baf4edb056622f5b043257ee201f3892a5d4.tar.gz | |
Convert .mk to .bp for ims am: dedacb65a0
am: c20b4680c6
Change-Id: I776e50466b8e14f04396b0642b57ce309a579c9c
| -rw-r--r-- | Android.bp | 24 | ||||
| -rw-r--r-- | Android.mk | 28 |
2 files changed, 24 insertions, 28 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 00000000..5a1d1e7e --- /dev/null +++ b/Android.bp @@ -0,0 +1,24 @@ +// Copyright 2013 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_library { + name: "ims-common", + installable: true, + + aidl: { + local_include_dirs: ["src/java"], + }, + srcs: ["src/java/**/*.java"], + +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 85b734ad..00000000 --- a/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2013 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_AIDL_INCLUDES := $(LOCAL_PATH)/src/java -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src/java) - -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := ims-common - -include $(BUILD_JAVA_LIBRARY) - -include $(call all-makefiles-under,$(LOCAL_PATH)) |