summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSasha Smundak <asmundak@google.com>2019-01-15 15:36:28 -0800
committerSasha Smundak <asmundak@google.com>2019-01-15 19:32:32 -0800
commitd5c85a38192bb33edafea5c89e8d5aa2add22e60 (patch)
tree3e4059b0fcf350b58a95cb23e1d4adda48064468
parent16bb750c5d77ae19950cb68ab1d253554843b706 (diff)
downloaddrrickorang-d5c85a38192bb33edafea5c89e8d5aa2add22e60.tar.gz
Convert Android.mk file to Android.bp
See build/soong/README.md for more information. Bug: 122332580 Test: treehugger Change-Id: I42aacda469599495bd602d5c5761231c03fbb2c6
-rw-r--r--LoopbackApp/app/src/main/cpp/Android.bp35
-rw-r--r--LoopbackApp/app/src/main/cpp/Android.mk35
2 files changed, 35 insertions, 35 deletions
diff --git a/LoopbackApp/app/src/main/cpp/Android.bp b/LoopbackApp/app/src/main/cpp/Android.bp
new file mode 100644
index 0000000..3d78846
--- /dev/null
+++ b/LoopbackApp/app/src/main/cpp/Android.bp
@@ -0,0 +1,35 @@
+cc_library_shared {
+ name: "libloopback",
+ srcs: [
+ "sles.cpp",
+ "byte_buffer.c",
+ "jni_native.c",
+ "loopback.c",
+ "audio_utils/atomic.c",
+ "audio_utils/fifo.c",
+ "audio_utils/roundup.c",
+ "lb2/loopback_test.cpp",
+ "lb2/sound_system_echo.cpp",
+ "lb2/test_context.cpp",
+ "lb2/loopback2.cpp",
+ "lb2/sound_system_aaudio.cpp",
+ "lb2/oboe/src/aaudio/AAudioLoader.cpp",
+ ],
+ include_dirs: [
+ "frameworks/wilhelm/include",
+ "frameworks/av/media/libaaudio/include",
+ ],
+ shared_libs: [
+ "libOpenSLES",
+ "libdl",
+ "liblog",
+ "libandroid",
+ ],
+ //LOCAL_LDFLAGS += -Wl,--hash-style=sysv
+ //LOCAL_CFLAGS := -DSTDC_HEADERS
+ cppflags: [
+ "-fexceptions",
+ ],
+ cpp_std: "c++11",
+ c_std: "c11",
+}
diff --git a/LoopbackApp/app/src/main/cpp/Android.mk b/LoopbackApp/app/src/main/cpp/Android.mk
deleted file mode 100644
index c2cef77..0000000
--- a/LoopbackApp/app/src/main/cpp/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libloopback
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := \
- sles.cpp \
- byte_buffer.c \
- jni_native.c \
- loopback.c \
- audio_utils/atomic.c \
- audio_utils/fifo.c \
- audio_utils/roundup.c \
- lb2/loopback_test.cpp \
- lb2/sound_system_echo.cpp \
- lb2/test_context.cpp \
- lb2/loopback2.cpp \
- lb2/sound_system_aaudio.cpp \
- lb2/oboe/src/aaudio/AAudioLoader.cpp
-
-LOCAL_C_INCLUDES := \
- frameworks/wilhelm/include
-
-LOCAL_C_INCLUDES += \
- frameworks/av/media/libaaudio/include
-
-LOCAL_LDLIBS += -lOpenSLES -ldl -llog -landroid
-
-#LOCAL_LDFLAGS += -Wl,--hash-style=sysv
-#LOCAL_CFLAGS := -DSTDC_HEADERS
-LOCAL_CONLYFLAGS := -std=c11
-LOCAL_CPPFLAGS :=-std=c++11 -fexceptions
-
-include $(BUILD_SHARED_LIBRARY)