summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2016-08-03 15:29:04 -0500
committerElliott Hughes2016-08-03 15:29:04 -0500
commitb6e1d15056f2a9c136a640336d78d36ab58a719d (patch)
tree5de391aecdda2209bed566b67f5b3d5fbb591a78 /libprocessgroup/Android.mk
parent7e74e816460f0c130b6870f5251b03d4218c80da (diff)
parented3596aadfe5727752a2e93a8fa2a981dce5e8e5 (diff)
downloadplatform-system-core-b6e1d15056f2a9c136a640336d78d36ab58a719d.tar.gz
platform-system-core-b6e1d15056f2a9c136a640336d78d36ab58a719d.tar.xz
platform-system-core-b6e1d15056f2a9c136a640336d78d36ab58a719d.zip
resolve merge conflicts of ed3596a to stage-aosp-master
Change-Id: I3c41782e2bf3563d3e3d6232d39eff3da94843fc
Diffstat (limited to 'libprocessgroup/Android.mk')
-rw-r--r--libprocessgroup/Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/libprocessgroup/Android.mk b/libprocessgroup/Android.mk
index 9620ebdd6..0bfc391c7 100644
--- a/libprocessgroup/Android.mk
+++ b/libprocessgroup/Android.mk
@@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
3include $(CLEAR_VARS) 3include $(CLEAR_VARS)
4LOCAL_SRC_FILES := processgroup.cpp 4LOCAL_SRC_FILES := processgroup.cpp
5LOCAL_MODULE := libprocessgroup 5LOCAL_MODULE := libprocessgroup
6LOCAL_STATIC_LIBRARIES := liblog 6LOCAL_STATIC_LIBRARIES := libbase
7LOCAL_C_INCLUDES := $(LOCAL_PATH)/include 7LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
8LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include 8LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
9LOCAL_CFLAGS := -Wall -Werror 9LOCAL_CFLAGS := -Wall -Werror
@@ -12,7 +12,7 @@ include $(BUILD_STATIC_LIBRARY)
12include $(CLEAR_VARS) 12include $(CLEAR_VARS)
13LOCAL_SRC_FILES := processgroup.cpp 13LOCAL_SRC_FILES := processgroup.cpp
14LOCAL_MODULE := libprocessgroup 14LOCAL_MODULE := libprocessgroup
15LOCAL_SHARED_LIBRARIES := liblog 15LOCAL_SHARED_LIBRARIES := libbase
16LOCAL_C_INCLUDES := $(LOCAL_PATH)/include 16LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
17LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include 17LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
18LOCAL_CFLAGS := -Wall -Werror 18LOCAL_CFLAGS := -Wall -Werror