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

Commit f3b785ae authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Move StateQueueInstantiations to libinstantssq"

parents 0220fd3e 3e8027a0

media/libmedia/Android.mk

+16 −6
Original line number Diff line number Diff line
@@ -60,16 +60,13 @@ LOCAL_SRC_FILES:= \ 


LOCAL_SRC_FILES += ../libnbaio/roundup.c



# for <cutils/atomic-inline.h>

LOCAL_CFLAGS += -DANDROID_SMP=$(if $(findstring true,$(TARGET_CPU_SMP)),1,0)

LOCAL_SRC_FILES += SingleStateQueue.cpp

LOCAL_CFLAGS += -DSINGLE_STATE_QUEUE_INSTANTIATIONS='"SingleStateQueueInstantiations.cpp"'

# Consider a separate a library for SingleStateQueueInstantiations.



LOCAL_SHARED_LIBRARIES := \

	libui liblog libcutils libutils libbinder libsonivox libicuuc libicui18n libexpat \

        libcamera_client libstagefright_foundation \

        libgui libdl libaudioutils

LOCAL_SHARED_LIBRARIES += libnbaio



LOCAL_STATIC_LIBRARIES += libinstantssq



LOCAL_WHOLE_STATIC_LIBRARY := libmedia_helper
@@ -84,3 +81,16 @@ LOCAL_C_INCLUDES := \ 
    $(call include-path-for, audio-utils)



include $(BUILD_SHARED_LIBRARY)



include $(CLEAR_VARS)



# for <cutils/atomic-inline.h>

LOCAL_CFLAGS += -DANDROID_SMP=$(if $(findstring true,$(TARGET_CPU_SMP)),1,0)

LOCAL_SRC_FILES += SingleStateQueue.cpp

LOCAL_CFLAGS += -DSINGLE_STATE_QUEUE_INSTANTIATIONS='"SingleStateQueueInstantiations.cpp"'

# Consider a separate a library for SingleStateQueueInstantiations.



LOCAL_MODULE := libinstantssq

LOCAL_MODULE_TAGS := optional



include $(BUILD_STATIC_LIBRARY)

media/libnbaio/Android.mk

+3 −4
Original line number Diff line number Diff line
@@ -31,9 +31,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    libcommon_time_client \

    libcutils \

    libutils \

    liblog \

    libmedia

# This dependency on libmedia is for SingleStateQueueInstantiations.

# Consider a separate a library for SingleStateQueueInstantiations.

    liblog



LOCAL_STATIC_LIBRARIES += libinstantssq



include $(BUILD_SHARED_LIBRARY)