summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2016-06-06 23:19:55 -0500
committerElliott Hughes2016-06-06 23:19:55 -0500
commit8d532e47376859e2ea8f953ebe75d24560e80464 (patch)
treeea9edc7539e6d0e7ce9515efa57a73a6e93e63e7 /libprocessgroup/Android.mk
parent27a68ef007734929a6cfb46c233c5b1757f7786c (diff)
parentcea1d0465b400f25db6a85547381713746d39e36 (diff)
downloadplatform-system-core-8d532e47376859e2ea8f953ebe75d24560e80464.tar.gz
platform-system-core-8d532e47376859e2ea8f953ebe75d24560e80464.tar.xz
platform-system-core-8d532e47376859e2ea8f953ebe75d24560e80464.zip
resolve merge conflicts of cea1d04 to nyc-dev-plus-aosp
Change-Id: I41cdca717664a16f00fd1b28076dd752fa96653d
Diffstat (limited to 'libprocessgroup/Android.mk')
-rw-r--r--libprocessgroup/Android.mk11
1 files changed, 10 insertions, 1 deletions
diff --git a/libprocessgroup/Android.mk b/libprocessgroup/Android.mk
index 1885fa5dd..9620ebdd6 100644
--- a/libprocessgroup/Android.mk
+++ b/libprocessgroup/Android.mk
@@ -3,7 +3,16 @@ 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_SHARED_LIBRARIES := liblog libutils 6LOCAL_STATIC_LIBRARIES := liblog
7LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
8LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
9LOCAL_CFLAGS := -Wall -Werror
10include $(BUILD_STATIC_LIBRARY)
11
12include $(CLEAR_VARS)
13LOCAL_SRC_FILES := processgroup.cpp
14LOCAL_MODULE := libprocessgroup
15LOCAL_SHARED_LIBRARIES := liblog
7LOCAL_C_INCLUDES := $(LOCAL_PATH)/include 16LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
8LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include 17LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
9LOCAL_CFLAGS := -Wall -Werror 18LOCAL_CFLAGS := -Wall -Werror