diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:08:00 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:08:00 +0000 |
commit | c278198c811148f7b0fd16c41026206834213a13 (patch) | |
tree | ee43c6b47d9f36bdabb1b33437d56e46091c22de | |
parent | a5d7c312552f8d6336c3a6e1640b05944800e3db (diff) | |
parent | 24f527b4e971249eef0fcd97c1f0a0d15bd99d63 (diff) | |
download | walt-c278198c811148f7b0fd16c41026206834213a13.tar.gz |
Snap for 8570526 from 24f527b4e971249eef0fcd97c1f0a0d15bd99d63 to mainline-mediaprovider-releaseaml_mpr_341713020aml_mpr_341614010aml_mpr_341511070aml_mpr_341411070aml_mpr_341313030aml_mpr_341111030aml_mpr_341111020aml_mpr_341015090aml_mpr_341015030aml_mpr_340919000aml_mpr_331918000aml_mpr_331812020aml_mpr_331711020aml_mpr_331613010aml_mpr_331512020aml_mpr_331412040aml_mpr_331311080aml_mpr_331112050aml_mpr_331112030aml_mpr_331011070aml_mpr_330911040aml_mpr_330811020android14-mainline-mediaprovider-releaseandroid13-mainline-mediaprovider-release
Change-Id: Ifd8afdc829bcc0ccbafc5124bf1a2e451c7223e9
-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 |