Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00e2cbcf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "libaaudio: use shared library for tests and examples" into oc-dr1-dev

parents db7b0a5e 0f6bf435

media/libaaudio/examples/input_monitor/Android.mk

+1 −6
Original line number Diff line number Diff line 
# include $(call all-subdir-makefiles)



# Just include static/ for now.

LOCAL_PATH := $(call my-dir)

#include $(LOCAL_PATH)/jni/Android.mk

include $(LOCAL_PATH)/static/Android.mk
 
include $(call all-subdir-makefiles)

media/libaaudio/examples/input_monitor/jni/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ LOCAL_C_INCLUDES := \ 
# NDK recommends using this kind of relative path instead of an absolute path.

LOCAL_SRC_FILES:= ../src/input_monitor.cpp

LOCAL_SHARED_LIBRARIES := libaaudio

LOCAL_MODULE := input_monitor_ndk

LOCAL_MODULE := input_monitor

include $(BUILD_EXECUTABLE)



include $(CLEAR_VARS)
@@ -23,7 +23,7 @@ LOCAL_C_INCLUDES := \ 


LOCAL_SRC_FILES:= ../src/input_monitor_callback.cpp

LOCAL_SHARED_LIBRARIES := libaaudio

LOCAL_MODULE := input_monitor_callback_ndk

LOCAL_MODULE := input_monitor_callback

include $(BUILD_EXECUTABLE)



include $(CLEAR_VARS)

media/libaaudio/examples/input_monitor/static/Android.mk

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := samples

LOCAL_C_INCLUDES := \

    $(call include-path-for, audio-utils) \

    frameworks/av/media/libaaudio/include \

    frameworks/av/media/libaaudio/examples/utils



# TODO reorganize folders to avoid using ../

LOCAL_SRC_FILES:= ../src/input_monitor.cpp



LOCAL_SHARED_LIBRARIES := libaudioutils libmedia \

                          libbinder libcutils libutils \

                          libaudioclient liblog libtinyalsa libaudiomanager

LOCAL_STATIC_LIBRARIES := libaaudio



LOCAL_MODULE := input_monitor

include $(BUILD_EXECUTABLE)





include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := tests

LOCAL_C_INCLUDES := \

    $(call include-path-for, audio-utils) \

    frameworks/av/media/libaaudio/include \

    frameworks/av/media/libaaudio/examples/utils



LOCAL_SRC_FILES:= ../src/input_monitor_callback.cpp



LOCAL_SHARED_LIBRARIES := libaudioutils libmedia \

                          libbinder libcutils libutils \

                          libaudioclient liblog libaudiomanager

LOCAL_STATIC_LIBRARIES := libaaudio



LOCAL_MODULE := input_monitor_callback

include $(BUILD_EXECUTABLE)

media/libaaudio/examples/input_monitor/static/README.md

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
Makefile for building simple command line examples.

They link with AAudio as a static library.

media/libaaudio/examples/write_sine/jni/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ LOCAL_C_INCLUDES := \ 
# NDK recommends using this kind of relative path instead of an absolute path.

LOCAL_SRC_FILES:= ../src/write_sine.cpp

LOCAL_SHARED_LIBRARIES := libaaudio

LOCAL_MODULE := write_sine_ndk

LOCAL_MODULE := write_sine

include $(BUILD_EXECUTABLE)



include $(CLEAR_VARS)
@@ -23,7 +23,7 @@ LOCAL_C_INCLUDES := \ 


LOCAL_SRC_FILES:= ../src/write_sine_callback.cpp

LOCAL_SHARED_LIBRARIES := libaaudio

LOCAL_MODULE := write_sine_callback_ndk

LOCAL_MODULE := write_sine_callback

include $(BUILD_EXECUTABLE)



include $(CLEAR_VARS)