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

Commit 1b339099 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "merge libsurfaceflinger_client into libgui"

parents 87e04970 696257cc

cmds/bootanimation/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libskia \

    libEGL \

    libGLESv1_CM \

    libsurfaceflinger_client

    libgui



LOCAL_C_INCLUDES := \

	$(call include-path-for, corecg graphics)

cmds/screencap/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libbinder \

	libskia \

    libui \

    libsurfaceflinger_client

    libgui



LOCAL_MODULE:= screencap

cmds/stagefright/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ LOCAL_SRC_FILES:= \ 


LOCAL_SHARED_LIBRARIES := \

	libstagefright libmedia libutils libbinder libstagefright_foundation \

        libskia libsurfaceflinger_client libgui

        libskia libgui



LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \
@@ -107,7 +107,7 @@ LOCAL_SRC_FILES:= \ 
        stream.cpp    \



LOCAL_SHARED_LIBRARIES := \

	libstagefright liblog libutils libbinder libsurfaceflinger_client \

	libstagefright liblog libutils libbinder libgui \

        libstagefright_foundation libmedia



LOCAL_C_INCLUDES:= \
@@ -132,7 +132,7 @@ LOCAL_SRC_FILES:= \ 


LOCAL_SHARED_LIBRARIES := \

	libstagefright liblog libutils libbinder libstagefright_foundation \

        libmedia libsurfaceflinger_client libcutils libui

        libmedia libgui libcutils libui



LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

core/jni/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ LOCAL_SHARED_LIBRARIES := \ 
	libnetutils \

	libui \

	libgui \

	libsurfaceflinger_client \

	libcamera_client \

	libskia \

	libsqlite \

graphics/jni/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ LOCAL_SHARED_LIBRARIES := \ 
        libskia \

        libutils \

        libui \

        libsurfaceflinger_client

        libgui



LOCAL_STATIC_LIBRARIES :=