diff options
author | Tai Kuo <taikuo@google.com> | 2020-06-18 12:45:10 +0800 |
---|---|---|
committer | Tai Kuo <taikuo@google.com> | 2020-06-19 15:26:36 +0800 |
commit | 098c8fb26dedf92edcb8b077e9c4dadeb51450ad (patch) | |
tree | 7336bb04f595404dae6bed38cf0ec0840b3f6521 /android | |
parent | 1f4104148dbcca978b792d68dadc414872576955 (diff) | |
download | walt-098c8fb26dedf92edcb8b077e9c4dadeb51450ad.tar.gz |
Revert "Convert sync_clock_jni to Android.bp"
This reverts commit d4e5f84fbee26cf0c8bf99e807539fbbcf159dd4.
ndkbuild does not support Android.bp yet.
Bug: 149721303
Test: `mma -j48` in android/WALT
Change-Id: Iaf060a65dc95e74f7d59338c4b740e49cf2a8035
Signed-off-by: Tai Kuo <taikuo@google.com>
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, 30 insertions, 37 deletions
diff --git a/android/WALT/app/src/main/jni/Android.bp b/android/WALT/app/src/main/jni/Android.bp deleted file mode 100644 index a789f4b..0000000 --- a/android/WALT/app/src/main/jni/Android.bp +++ /dev/null @@ -1,37 +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. -// - -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 new file mode 100644 index 0000000..3307036 --- /dev/null +++ b/android/WALT/app/src/main/jni/Android.mk @@ -0,0 +1,30 @@ +# 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) |