Merge kwd to master

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04

1 files changed, 35 insertions, 0 deletions

diff --git a/Android.mk b/Android.mk
new file mode 100644
index 00000000..658b091d
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,35 @@
+# 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 := \
+    src/java/com/android/ims/internal/IImsRegistrationListener.aidl \
+    src/java/com/android/ims/internal/IImsStreamMediaSession.aidl \
+    src/java/com/android/ims/internal/IImsCallSession.aidl \
+    src/java/com/android/ims/internal/IImsCallSessionListener.aidl \
+    src/java/com/android/ims/internal/IImsService.aidl \
+    src/java/com/android/ims/internal/IImsUt.aidl \
+    src/java/com/android/ims/internal/IImsUtListener.aidl \
+    $(call all-java-files-under, src/java)
+
+#LOCAL_JAVA_LIBRARIES := telephony-common
+
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := ims-common
+
+include $(BUILD_JAVA_LIBRARY)