diff options
author | Dan Willemsen <dwillemsen@google.com> | 2018-11-19 18:05:11 -0800 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2018-11-19 18:05:11 -0800 |
commit | d4e5f84fbee26cf0c8bf99e807539fbbcf159dd4 (patch) | |
tree | 8db6e6f4025747cc48270f02bb2b145d0a77d1ea /android | |
parent | 56b988de963f7cc6eac4924da6845249e2d177e0 (diff) | |
download | walt-d4e5f84fbee26cf0c8bf99e807539fbbcf159dd4.tar.gz |
Convert sync_clock_jni to Android.bpandroid-wear-8.0.0_r2
See build/soong/README.md for more information.
Test: cd external/walt; mma
Change-Id: I1c98d046b51f7bdc8909571bd684a0754fa87820
Diffstat (limited to 'android')
-rw-r--r-- | android/WALT/app/src/main/jni/Android.bp | 37 | ||||
-rw-r--r-- | android/WALT/app/src/main/jni/Android.mk | 30 |
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) |