diff options
| author | ELIYAZ MOMIN <mohammedeliyaz@google.com> | 2024-07-08 13:35:28 +0000 |
|---|---|---|
| committer | Ian Kasprzak <iankaz@google.com> | 2024-07-08 16:35:45 +0000 |
| commit | 324358965a32408c2339c43ccfb95e6e0c775d9b (patch) | |
| tree | 1a5280f47c206858d68f6631f040f5ee16c5ab7a | |
| parent | 5bc0f6819bf9b720dfe98bd43d2ca00833b4ecdc (diff) | |
Revert "Remove "libjson" Android.mk"
This reverts commit 5bc0f6819bf9b720dfe98bd43d2ca00833b4ecdc.
Reason for revert: b/351134318 - Breaks aosp_barbet on AOSP phone branch. Barbet is not EOL for another month for AOSP.
Change-Id: I257755263d912a85d968fbaf49d518ec556cf026
| -rw-r--r-- | Android.mk | 5 | ||||
| -rw-r--r-- | json-c/Android.mk | 38 |
2 files changed, 43 insertions, 0 deletions
@@ -31,3 +31,8 @@ $(eval $(call declare-copy-files-license-metadata,device/google/redbull,wpa_supp $(eval $(call declare-copy-files-license-metadata,device/google/redbull,wpa_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) $(eval $(call declare-1p-copy-files,device/google/redbull,audio_policy_configuration.xml)) + +ifeq ($(USES_DEVICE_GOOGLE_REDBULL),true) + subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH)) + $(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk))) +endif diff --git a/json-c/Android.mk b/json-c/Android.mk new file mode 100644 index 00000000..6202a538 --- /dev/null +++ b/json-c/Android.mk @@ -0,0 +1,38 @@ +LIBJSON_ROOT := $(call my-dir) +include $(CLEAR_VARS) +LOCAL_MODULE := libjson +LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT legacy_unencumbered +LOCAL_LICENSE_CONDITIONS := notice unencumbered +LOCAL_PATH := $(LIBJSON_ROOT) +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/COPYING +LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include +LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr +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 \ + json_object.c \ + json_object_iterator.c \ + json_tokener.c \ + json_util.c \ + libjson.c \ + linkhash.c \ + printbuf.c \ + random_seed.c +LOCAL_SHARED_LIBRARIES := libcutils libutils +LOCAL_MODULE_TAG := optional +LOCAL_VENDOR_MODULE := true +include $(BUILD_SHARED_LIBRARY) |