From af36de328f6f103d57331d8ae2da9cbf13aa3028 Mon Sep 17 00:00:00 2001 From: James Zern Date: Tue, 2 Jun 2026 20:47:52 -0700 Subject: [PATCH] Android.mk: add a check for NDK_ROOT This simplifies integration with the Android platform and avoids the files from being used when a non-NDK build is performed. In that case Android.bp is preferred. Change-Id: Ic669f33931ad294d6570341b4e39fccd7e7f1ad8 Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/7897896 Commit-Queue: James Zern Reviewed-by: Frank Barchard --- Android.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Android.mk b/Android.mk index c83bdb7ff..a5fb72f63 100644 --- a/Android.mk +++ b/Android.mk @@ -1,4 +1,7 @@ # This is the Android makefile for libyuv for NDK. + +# Ignore this file during non-NDK builds. +ifdef NDK_ROOT LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -104,3 +107,4 @@ LOCAL_SRC_FILES := \ LOCAL_MODULE := libyuv_unittest include $(BUILD_NATIVE_TEST) +endif # NDK_ROOT