diff options
| author | Elliott Hughes | 2016-08-03 15:29:04 -0500 |
|---|---|---|
| committer | Elliott Hughes | 2016-08-03 15:29:04 -0500 |
| commit | b6e1d15056f2a9c136a640336d78d36ab58a719d (patch) | |
| tree | 5de391aecdda2209bed566b67f5b3d5fbb591a78 /libprocessgroup/Android.mk | |
| parent | 7e74e816460f0c130b6870f5251b03d4218c80da (diff) | |
| parent | ed3596aadfe5727752a2e93a8fa2a981dce5e8e5 (diff) | |
| download | platform-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.mk | 4 |
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) | |||
| 3 | include $(CLEAR_VARS) | 3 | include $(CLEAR_VARS) |
| 4 | LOCAL_SRC_FILES := processgroup.cpp | 4 | LOCAL_SRC_FILES := processgroup.cpp |
| 5 | LOCAL_MODULE := libprocessgroup | 5 | LOCAL_MODULE := libprocessgroup |
| 6 | LOCAL_STATIC_LIBRARIES := liblog | 6 | LOCAL_STATIC_LIBRARIES := libbase |
| 7 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/include | 7 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/include |
| 8 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include | 8 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include |
| 9 | LOCAL_CFLAGS := -Wall -Werror | 9 | LOCAL_CFLAGS := -Wall -Werror |
| @@ -12,7 +12,7 @@ include $(BUILD_STATIC_LIBRARY) | |||
| 12 | include $(CLEAR_VARS) | 12 | include $(CLEAR_VARS) |
| 13 | LOCAL_SRC_FILES := processgroup.cpp | 13 | LOCAL_SRC_FILES := processgroup.cpp |
| 14 | LOCAL_MODULE := libprocessgroup | 14 | LOCAL_MODULE := libprocessgroup |
| 15 | LOCAL_SHARED_LIBRARIES := liblog | 15 | LOCAL_SHARED_LIBRARIES := libbase |
| 16 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/include | 16 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/include |
| 17 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include | 17 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include |
| 18 | LOCAL_CFLAGS := -Wall -Werror | 18 | LOCAL_CFLAGS := -Wall -Werror |