diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-13 04:07:04 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-13 04:07:04 +0000 |
commit | 283b4d321a18934f5a21076f5713ec3a7e19359b (patch) | |
tree | ee43c6b47d9f36bdabb1b33437d56e46091c22de | |
parent | 3cc8c209dcfa70a9d5b9e4cab43c1010b8f3bdc1 (diff) | |
parent | 24f527b4e971249eef0fcd97c1f0a0d15bd99d63 (diff) | |
download | walt-android13-platform-release.tar.gz |
Snap for 7912506 from 24f527b4e971249eef0fcd97c1f0a0d15bd99d63 to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r7android-platform-13.0.0_r6android-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3android-platform-13.0.0_r2android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-platform-releaseandroid13-gsi
Change-Id: I6720ae6dcef1b9798a8d77aadeb3879eb0cc3476
-rw-r--r-- | android/WALT/app/src/main/jni/Android.bp | 40 | ||||
-rw-r--r-- | android/WALT/app/src/main/jni/Android.mk | 8 |
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 |