diff options
| author | Ying Wang <wangying@google.com> | 2013-04-09 22:27:50 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-04-09 22:27:50 -0700 |
| commit | 46f19772ae5659c1659a0ac8f1f72389e94a85d4 (patch) | |
| tree | 68b1a09d332052fa7cf95afbf1768778392bdb2f /cmds | |
| parent | 13c9a949b5d74f36edbdbfda764fe554cdbaefa9 (diff) | |
| parent | c76e8a20e255c72e210d3a276acc69f7e9b7e3fd (diff) | |
| download | frameworks_native-46f19772ae5659c1659a0ac8f1f72389e94a85d4.zip frameworks_native-46f19772ae5659c1659a0ac8f1f72389e94a85d4.tar.gz frameworks_native-46f19772ae5659c1659a0ac8f1f72389e94a85d4.tar.bz2 | |
resolved conflicts for merge of c76e8a20 to jb-mr2-dev-plus-aosp
Change-Id: I895a8ad8c936a80c70aaac739c6441d3c7c55834
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/dumpstate/Android.mk | 2 | ||||
| -rw-r--r-- | cmds/dumpsys/Android.mk | 1 | ||||
| -rw-r--r-- | cmds/installd/Android.mk | 1 | ||||
| -rw-r--r-- | cmds/ip-up-vpn/Android.mk | 2 | ||||
| -rw-r--r-- | cmds/screenshot/Android.mk | 2 |
5 files changed, 5 insertions, 3 deletions
diff --git a/cmds/dumpstate/Android.mk b/cmds/dumpstate/Android.mk index 8640983..3194dbf 100644 --- a/cmds/dumpstate/Android.mk +++ b/cmds/dumpstate/Android.mk @@ -9,7 +9,7 @@ LOCAL_SRC_FILES := dumpstate.c utils.c LOCAL_MODULE := dumpstate -LOCAL_SHARED_LIBRARIES := libcutils libselinux +LOCAL_SHARED_LIBRARIES := libcutils liblog libselinux ifdef BOARD_LIB_DUMPSTATE LOCAL_STATIC_LIBRARIES := $(BOARD_LIB_DUMPSTATE) diff --git a/cmds/dumpsys/Android.mk b/cmds/dumpsys/Android.mk index 42b1b73..9be0901 100644 --- a/cmds/dumpsys/Android.mk +++ b/cmds/dumpsys/Android.mk @@ -6,6 +6,7 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libutils \ + liblog \ libbinder diff --git a/cmds/installd/Android.mk b/cmds/installd/Android.mk index 1dd4ee5..e11b4f8 100644 --- a/cmds/installd/Android.mk +++ b/cmds/installd/Android.mk @@ -30,6 +30,7 @@ LOCAL_SRC_FILES := \ LOCAL_SHARED_LIBRARIES := \ libcutils \ + liblog \ libselinux LOCAL_STATIC_LIBRARIES := \ diff --git a/cmds/ip-up-vpn/Android.mk b/cmds/ip-up-vpn/Android.mk index de81889..36bbdf5 100644 --- a/cmds/ip-up-vpn/Android.mk +++ b/cmds/ip-up-vpn/Android.mk @@ -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 diff --git a/cmds/screenshot/Android.mk b/cmds/screenshot/Android.mk index 73a8e22..0afb2c5 100644 --- a/cmds/screenshot/Android.mk +++ b/cmds/screenshot/Android.mk @@ -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 |