Convert Android.mk file to Android.bp am: f729a7a528

am: 20b8e48fc8

Change-Id: I2ac0bfae58d049b91953e4f375bdbdf02ceef6c8

2 files changed, 23 insertions, 40 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..695f0b6
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,23 @@
+java_library {
+    name: "car-frameworks-service",
+    installable: true,
+    srcs: [
+        "src/**/*.java",
+        "src/com/android/internal/car/ICarServiceHelper.aidl",
+    ],
+    required: ["libcar-framework-service-jni"],
+    libs: ["services"],
+}
+
+cc_library_shared {
+    name: "libcar-framework-service-jni",
+    srcs: ["src/jni/com_android_internal_car_CarServiceHelperService.cpp"],
+    shared_libs: [
+        "libandroid_runtime",
+        "libhidlbase",
+        "liblog",
+        "libnativehelper",
+        "libsuspend",
+        "libutils",
+    ],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 870ef43..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) \
-    src/com/android/internal/car/ICarServiceHelper.aidl \
-
-LOCAL_JNI_SHARED_LIBRARIES := libcar-framework-service-jni
-LOCAL_REQUIRED_MODULES := libcar-framework-service-jni
-
-LOCAL_JAVA_LIBRARIES := services
-
-LOCAL_MODULE := car-frameworks-service
-
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := src/jni/com_android_internal_car_CarServiceHelperService.cpp
-
-LOCAL_C_INCLUDES += \
-    $(JNI_H_INCLUDE) \
-    system/core/libsuspend/include
-
-LOCAL_SHARED_LIBRARIES := \
-    libandroid_runtime \
-    libhidlbase \
-    liblog \
-    libnativehelper \
-    libsuspend \
-    libutils \
-
-LOCAL_MODULE := libcar-framework-service-jni
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
-
-# Include subdirectory makefiles
-# ============================================================
-include $(call all-makefiles-under,$(LOCAL_PATH))