Merge "Use exported headers instead of copying"

am: e0debcf33e

* commit 'e0debcf33e942e64e8ee11f2f71787651be5bdd6':
  Use exported headers instead of copying
This commit is contained in:
Colin Cross 2015-11-05 01:53:09 +00:00 committed by android-build-merger
commit 881cdcd155
3 changed files with 5 additions and 5 deletions

View file

@ -6,9 +6,9 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libpackagelistparser LOCAL_MODULE := libpackagelistparser
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := packagelistparser.c LOCAL_SRC_FILES := packagelistparser.c
LOCAL_COPY_HEADERS_TO := packagelistparser
LOCAL_COPY_HEADERS := packagelistparser.h
LOCAL_SHARED_LIBRARIES := liblog LOCAL_SHARED_LIBRARIES := liblog
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_SANITIZE := integer LOCAL_SANITIZE := integer
@ -22,9 +22,9 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libpackagelistparser LOCAL_MODULE := libpackagelistparser
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := packagelistparser.c LOCAL_SRC_FILES := packagelistparser.c
LOCAL_COPY_HEADERS_TO := packagelistparser
LOCAL_COPY_HEADERS := packagelistparser.h
LOCAL_STATIC_LIBRARIES := liblog LOCAL_STATIC_LIBRARIES := liblog
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_SANITIZE := integer LOCAL_SANITIZE := integer

View file

@ -29,7 +29,7 @@
#define LOG_TAG "packagelistparser" #define LOG_TAG "packagelistparser"
#include <utils/Log.h> #include <utils/Log.h>
#include "packagelistparser.h" #include <packagelistparser/packagelistparser.h>
#define CLOGE(fmt, ...) \ #define CLOGE(fmt, ...) \
do {\ do {\