Skip to content

Merge latest CAF tag and Remove header copying (LOCAL_COPY_HEADERS) #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SadmanSakibAlam wants to merge 4 commits into
base: eleven
Choose a base branch
from
Open

Merge latest CAF tag and Remove header copying (LOCAL_COPY_HEADERS) #2

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ab03d7
Merge `xdroid-CAF/staging-LA.QSSI.11.0.r1-13300-qssi.0`
xyzuan Oct 3, 2021
e5d5147
Merge tag 'LA.QSSI.11.0.r1-13300-qssi.0' of https://source.codeaurora…
SadmanSakibAlam Oct 4, 2021
1c7b9c8
Remove header copying (LOCAL_COPY_HEADERS)
asmundak Dec 11, 2019
3728bbd
Merge branch 'eleven' into eleven
SadmanSakibAlam Oct 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,10 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := libjson
LOCAL_PATH := $(LIBJSON_ROOT)
LOCAL_CFLAGS := -Werror -Wno-error=unused-parameter
LOCAL_CFLAGS := -Werror -Wno-unused-parameter
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
LOCAL_COPY_HEADERS_TO := libjson/inc
LOCAL_COPY_HEADERS := bits.h \
config.h \
debug.h \
linkhash.h \
arraylist.h \
json.h \
json_config.h \
json_inttypes.h \
json_util.h \
json_object.h \
json_tokener.h \
json_object_iterator.h \
json_c_version.h

LOCAL_SRC_FILES := arraylist.c \
debug.c \
json_c_version.c \
Expand All @@ -35,4 +19,4 @@ LOCAL_SRC_FILES := arraylist.c \
LOCAL_SHARED_LIBRARIES := libcutils libutils
LOCAL_MODULE_TAG := optional
LOCAL_VENDOR_MODULE := true
include $(BUILD_SHARED_LIBRARY)
include $(BUILD_SHARED_LIBRARY)