Skip to contentSkip to conversation

Android.mk: Remove obsolete build files

PATCH New Ricardo Ribalda 1 participant 1 message Nov 20, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Android.mk: Remove obsolete build files

Android.mk files are been obsoleted by Android.bp. Remove the Android.mk files.
https://android.googlesource.com/platform/build/+/HEAD/Deprecation.md

I have no way to test them and I suspect that they do not work. Eg:
It does not seem to create the media-bus-format-codes.h file.

Cc Paramanand Singh <[email protected]>
---
 lib/Android.mk                   |  4 ---
 lib/libv4l2/Android.mk           | 32 ------------------------
 lib/libv4lconvert/Android.mk     | 54 ----------------------------------------
 utils/v4l2-compliance/Android.mk | 27 --------------------
 utils/v4l2-ctl/Android.mk        | 27 --------------------
 utils/v4l2-dbg/Android.mk        | 20 ---------------
 6 files changed, 164 deletions(-)
lib/Android.mk deleted +0 -4
deleted file mode 100644
index 2e431205..00000000
@@ -1,4 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
lib/libv4l2/Android.mk deleted +0 -32
deleted file mode 100644
index c57626cb..00000000
@@ -1,32 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-    log.c \
-    libv4l2.c \
-    v4l2convert.c \
-    v4l2-plugin-android.c
-
-LOCAL_CFLAGS += -Wno-missing-field-initializers
-LOCAL_CFLAGS += -Wno-sign-compare
-LOCAL_CFLAGS += -include ../../android-config.h
-
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../include \
-    $(LOCAL_PATH)/../../include \
-    $(LOCAL_PATH)/../.. \
-	$(TOP)/bionic/libc/upstream-openbsd/lib/libc/gen
-
-LOCAL_SHARED_LIBRARIES := \
-    libutils \
-    libcutils \
-    libdl \
-    libssl \
-    libz
-
-LOCAL_STATIC_LIBRARIES := libv4l_convert
-LOCAL_MODULE := libv4l2
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
lib/libv4lconvert/Android.mk deleted +0 -54

54 lines not on this page · raw message

utils/v4l2-compliance/Android.mk deleted +0 -27
deleted file mode 100644
index a395ef9b..00000000
@@ -1,27 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := v4l2-compliance
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_CFLAGS += -DNO_LIBV4L2
-LOCAL_CFLAGS += -Wno-missing-braces
-LOCAL_CFLAGS += -Wno-missing-field-initializers
-LOCAL_CFLAGS += -include ../../android-config.h
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../.. \
-    $(LOCAL_PATH)/../../include \
-    $(LOCAL_PATH)/../common \
-    bionic \
-    external/stlport/stlport
-
-LOCAL_SHARED_LIBRARIES := libstlport
-
-LOCAL_SRC_FILES := \
-    v4l2-compliance.cpp v4l2-test-debug.cpp v4l2-test-input-output.cpp \
-    v4l2-test-controls.cpp v4l2-test-io-config.cpp v4l2-test-formats.cpp \
-    v4l2-test-buffers.cpp v4l2-test-codecs.cpp v4l2-test-colors.cpp \
-    v4l2-test-media.cpp v4l2-test-subdevs.cpp media-info.cpp v4l2-info.cpp
-
-include $(BUILD_EXECUTABLE)
utils/v4l2-ctl/Android.mk deleted +0 -27
deleted file mode 100644
index 3078c629..00000000
@@ -1,27 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := v4l2-ctl
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_CFLAGS += -DNO_LIBV4L2
-LOCAL_CFLAGS += -Wno-missing-field-initializers
-LOCAL_CFLAGS += -include ../../android-config.h
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../.. \
-    $(LOCAL_PATH)/../../include \
-    $(LOCAL_PATH)/../common \
-    bionic \
-    external/stlport/stlport
-
-LOCAL_SHARED_LIBRARIES := libstlport
-
-LOCAL_SRC_FILES := \
-    v4l2-ctl.cpp v4l2-ctl.h v4l2-ctl-common.cpp v4l2-ctl-tuner.cpp \
-    v4l2-ctl-io.cpp v4l2-ctl-stds.cpp v4l2-ctl-vidcap.cpp v4l2-ctl-vidout.cpp \
-    v4l2-ctl-overlay.cpp v4l2-ctl-vbi.cpp v4l2-ctl-selection.cpp v4l2-ctl-misc.cpp \
-    v4l2-ctl-streaming.cpp v4l2-ctl-sdr.cpp v4l2-ctl-edid.cpp v4l2-ctl-modes.cpp \
-    v4l2-ctl-meta.cpp v4l2-ctl-subdev.cpp v4l2-info.cpp media-info.cpp \
-    v4l2-tpg-colors.c v4l2-tpg-core.c v4l-stream.c codec-fwht.c
-include $(BUILD_EXECUTABLE)
utils/v4l2-dbg/Android.mk deleted +0 -20
deleted file mode 100644
index 4f424f65..00000000
@@ -1,20 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := v4l2-dbg
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_CFLAGS += -include ../../android-config.h
-
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../.. \
-    $(LOCAL_PATH)/../../include \
-    bionic \
-    external/stlport/stlport
-
-LOCAL_SHARED_LIBRARIES := libstlport
-
-LOCAL_SRC_FILES := v4l2-dbg.cpp
-
-include $(BUILD_EXECUTABLE)

---
base-commit: 625e604c48fa3c4e9737fa1ec8e1d473a378ca9c
change-id: 20241120-removeabp-307f4c8c6af2

Best regards,

Signature · 1 line
Ricardo Ribalda <[email protected]>