summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2022-12-15 19:11:51 -0800
committerJames Zern <jzern@google.com>2022-12-16 12:10:36 -0800
commit6fc1a9f96e6ed2e5cb8be068a06bf49bf1e2e354 (patch)
tree35757684df37b3cb2836fb4b3222e6b86549e02b /Android.mk
parent1d58575b18c63c400f4be9dbfd11ee4e74e3c0a5 (diff)
downloadlibwebp-6fc1a9f96e6ed2e5cb8be068a06bf49bf1e2e354.tar.gz
*/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: I6e334cf8b05a19da8452405f5f448f9e4b6e4a40
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index b53ee294..9d16f083 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,5 @@
+# Ignore this file during non-NDK builds.
+ifdef NDK_ROOT
LOCAL_PATH := $(call my-dir)
WEBP_CFLAGS := -Wall -DANDROID -DHAVE_MALLOC_H -DHAVE_PTHREAD -DWEBP_USE_THREAD
@@ -289,3 +291,4 @@ include $(WEBP_SRC_PATH)/examples/Android.mk
ifeq ($(USE_CPUFEATURES),yes)
$(call import-module,android/cpufeatures)
endif
+endif # NDK_ROOT