Merge "Convert frameworks/opt/inputmethodcommon to Android.bp"
am: eb0512fd15

Change-Id: I7d0923e5d3eef45677eb1cc0c5a141146ead7ea2
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..dc0f9cd
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,19 @@
+// 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.
+
+java_library {
+    name: "inputmethod-common",
+    sdk_version: "14",
+    srcs: ["java/**/*.java"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index d8ed7c4..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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 := inputmethod-common
-LOCAL_SDK_VERSION := 14
-LOCAL_SRC_FILES := \
-     $(call all-java-files-under, java)
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-# Build the test package
-include $(call all-makefiles-under, $(LOCAL_PATH))