Snap for 8358640 from 24f527b4e971249eef0fcd97c1f0a0d15bd99d63 to mainline-go-media-releaseaml_go_med_330913000android13-mainline-go-media-release

Change-Id: I6ca5229f579dae8d9fc66d709c2a9e649161bd07

2 files changed, 48 insertions, 0 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..577e7aa
--- /dev/null
+++ b/android/WALT/app/src/main/jni/Android.bp
@@ -0,0 +1,40 @@
+// 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.
+//
+
+package {
+    // See: http://go/android-license-faq
+    default_applicable_licenses: [
+        "Android-Apache-2.0",
+    ],
+}
+
+cc_library_shared {
+    name: "sync_clock_jni",
+    srcs: [
+        "sync_clock_jni.c",
+        "sync_clock.c",
+        "player.c",
+    ],
+    cflags: [
+        "-g",
+        "-DUSE_LIBLOG",
+        "-Werror",
+        "-Wno-deprecated-declarations",
+    ],
+    shared_libs: [
+        "libOpenSLES",
+        "liblog",
+    ],
+}
diff --git a/android/WALT/app/src/main/jni/Android.mk b/android/WALT/app/src/main/jni/Android.mk
index d01947c..c432ff5 100644
--- a/android/WALT/app/src/main/jni/Android.mk
+++ b/android/WALT/app/src/main/jni/Android.mk
@@ -13,6 +13,12 @@
 # limitations under the License.
 #
 
+# Note that the platform modules are defined in the Android.bp. This file is
+# used for the NDK.
+
+# If we're being invoked from ndk-build, we'll have NDK_ROOT defined.
+ifdef NDK_ROOT
+
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -28,3 +34,5 @@ LOCAL_CFLAGS := -g -DUSE_LIBLOG -Werror -Wno-deprecated-declarations
 LOCAL_LDLIBS := -lOpenSLES -llog
 
 include $(BUILD_SHARED_LIBRARY)
+
+endif