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

Commit c76e8a20 authored Apr 10, 2013 by Ying Wang Committed by Android (Google) Code Review Apr 10, 2013

Merge "Add liblog" into jb-mr2-dev

parents 8758a3e3 8a0cb4ee

cmds/dumpstate/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ LOCAL_SRC_FILES := dumpstate.c utils.c

		LOCAL_MODULE := dumpstate

		LOCAL_SHARED_LIBRARIES := libcutils
		LOCAL_SHARED_LIBRARIES := libcutils liblog

		ifdef BOARD_LIB_DUMPSTATE
		LOCAL_STATIC_LIBRARIES := $(BOARD_LIB_DUMPSTATE)

cmds/dumpsys/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ LOCAL_SRC_FILES:= \

		LOCAL_SHARED_LIBRARIES := \
		libutils \
		liblog \
		libbinder

cmds/installd/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ LOCAL_SRC_FILES := \

		LOCAL_SHARED_LIBRARIES := \
		libcutils \
		liblog \
		libselinux

		LOCAL_STATIC_LIBRARIES := \

cmds/ip-up-vpn/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ LOCAL_PATH := $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_SRC_FILES := ip-up-vpn.c
		LOCAL_SHARED_LIBRARIES := libcutils
		LOCAL_SHARED_LIBRARIES := libcutils liblog
		LOCAL_MODULE := ip-up-vpn
		LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/ppp
		LOCAL_MODULE_TAGS := optional

cmds/screenshot/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ LOCAL_SRC_FILES := screenshot.c

		LOCAL_MODULE := screenshot

		LOCAL_SHARED_LIBRARIES := libcutils libz
		LOCAL_SHARED_LIBRARIES := libcutils libz liblog
		LOCAL_STATIC_LIBRARIES := libpng
		LOCAL_C_INCLUDES += external/zlib