Convert sync_clock_jni to Android.bp am: d4e5f84fbe am: 74949f7174

am: 60690b820b

Change-Id: If09c2643a892c42214c58581d21345df93411572

2 files changed, 37 insertions, 30 deletions

diff --git a/android/WALT/app/src/main/jni/Android.bp b/android/WALT/app/src/main/jni/Android.bp
new file mode 100644
index 0000000..a789f4b
--- /dev/null
+++ b/android/WALT/app/src/main/jni/Android.bp
@@ -0,0 +1,37 @@
+// Copyright (C) 2015 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.
+//
+
+cc_library_shared {
+    name: "sync_clock_jni",
+    srcs: [
+        "sync_clock_jni.c",
+        "sync_clock.c",
+        "player.c",
+    ],
+
+    cflags: [
+        "-g",
+        "-DUSE_LIBLOG",
+        "-Werror",
+    ],
+
+    shared_libs: [
+        // needed for logcat
+        "libcutils",
+
+        "libOpenSLES",
+        "liblog",
+    ],
+}
diff --git a/android/WALT/app/src/main/jni/Android.mk b/android/WALT/app/src/main/jni/Android.mk
deleted file mode 100644
index 3307036..0000000
--- a/android/WALT/app/src/main/jni/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2015 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    := sync_clock_jni
-LOCAL_SRC_FILES := sync_clock_jni.c sync_clock.c player.c
-
-LOCAL_CFLAGS := -g -DUSE_LIBLOG -Werror
-
-# needed for logcat
-LOCAL_SHARED_LIBRARIES := libcutils
-
-LOCAL_LDLIBS := -lOpenSLES -llog
-
-include $(BUILD_SHARED_LIBRARY)