diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-07-04 08:19:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-07-04 08:19:11 +0000 |
| commit | b275cce4cb2f9a29ed7e01d4d70c6ed382b13967 (patch) | |
| tree | 42fad731a190b322655a53e8be375aebe32a578f | |
| parent | db347b9afb048a856d228cd7b157d5462880b491 (diff) | |
| parent | 5bc0f6819bf9b720dfe98bd43d2ca00833b4ecdc (diff) | |
Merge "Remove "libjson" Android.mk" into main
| -rw-r--r-- | Android.mk | 5 | ||||
| -rw-r--r-- | json-c/Android.mk | 38 |
2 files changed, 0 insertions, 43 deletions
@@ -31,8 +31,3 @@ $(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 deleted file mode 100644 index 6202a538..00000000 --- a/json-c/Android.mk +++ /dev/null @@ -1,38 +0,0 @@ -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) |