aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2018-08-07 13:19:34 -0400
committerColin Cross <ccross@android.com>2018-08-09 13:35:02 -0700
commitdedacb65a04963a5a2028cad99d0fc3cf8e569dc (patch)
treeb7216fb2ed53f81b056e132674e0db5e45f43caa
parente7a4144a5fdfb979102cc62284edc936368f62b1 (diff)
downloadims-dedacb65a04963a5a2028cad99d0fc3cf8e569dc.tar.gz
Convert .mk to .bp for ims
Test: build Change-Id: Ic40605e4ae9499bfe9a44d38f622e385cebb0520 Merged-In: Ic40605e4ae9499bfe9a44d38f622e385cebb0520 (cherry picked from commit fcdb07aebf851ed749dad8003c6c15cc1ba224fc)
-rw-r--r--Android.bp24
-rw-r--r--Android.mk28
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))