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

Commit 30dd09a1 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-7bfcab52-d1c0-4256-9d6b-5b5092bc78ca-for-git_oc-mr1-release-41... 

release-request-7bfcab52-d1c0-4256-9d6b-5b5092bc78ca-for-git_oc-mr1-release-4133428 snap-temp-L95800000077479875

Change-Id: I53d5eb99ac1424f2a7166439f45de7f02240ae6f
parents 3ab824f9 5af194cf

camera/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -67,7 +67,10 @@ cc_library_shared { 
        "system/media/private/camera/include",

        "frameworks/native/include/media/openmax",

    ],

    export_include_dirs: ["include/camera"],

    export_include_dirs: [

         "include",

         "include/camera"

    ],

    export_shared_lib_headers: ["libcamera_metadata"],



    cflags: [

include/private/media/AudioTrackShared.h

+4 −0
Original line number Diff line number Diff line
@@ -568,6 +568,9 @@ public: 
    // which may include non-contiguous frames

    virtual size_t      framesReady();



    // Safe frames ready query used by dump() - this has no side effects.

    virtual size_t      framesReadySafe() const;



    // Currently AudioFlinger will call framesReady() for a fast track from two threads:

    // FastMixer thread, and normal mixer thread.  This is dangerous, as the proxy is intended

    // to be called from at most one thread of server, and one thread of client.
@@ -620,6 +623,7 @@ protected: 


public:

    virtual size_t      framesReady();

    virtual size_t      framesReadySafe() const override;

    virtual void        framesReadyIsCalledByMultipleThreads();

    virtual status_t    obtainBuffer(Buffer* buffer, bool ackFlush);

    virtual void        releaseBuffer(Buffer* buffer);

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)