diff options
| author | James Zern <jzern@google.com> | 2022-12-16 20:59:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-12-16 20:59:49 +0000 |
| commit | 106a57c1dbacc063d3111ef0774e49a655866968 (patch) | |
| tree | 7d41207713968e284f509702bbfe16080497fc39 | |
| parent | c5e841c417c3f319b3c6df641123d8513baeba5b (diff) | |
| parent | 6fc1a9f96e6ed2e5cb8be068a06bf49bf1e2e354 (diff) | |
| download | libwebp-106a57c1dbacc063d3111ef0774e49a655866968.tar.gz | |
Merge "*/Android.mk: add a check for NDK_ROOT" into main
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | examples/Android.mk | 3 | ||||
| -rw-r--r-- | imageio/Android.mk | 3 |
3 files changed, 9 insertions, 0 deletions
@@ -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 diff --git a/examples/Android.mk b/examples/Android.mk index 13fb3b46..ae0f5b42 100644 --- a/examples/Android.mk +++ b/examples/Android.mk @@ -1,3 +1,5 @@ +# Ignore this file during non-NDK builds. +ifdef NDK_ROOT LOCAL_PATH := $(call my-dir) ################################################################################ @@ -91,3 +93,4 @@ LOCAL_STATIC_LIBRARIES := example_util imageio_util webp LOCAL_MODULE := webpinfo_example include $(BUILD_EXECUTABLE) +endif # NDK_ROOT diff --git a/imageio/Android.mk b/imageio/Android.mk index e779f71e..1c8b8367 100644 --- a/imageio/Android.mk +++ b/imageio/Android.mk @@ -1,3 +1,5 @@ +# Ignore this file during non-NDK builds. +ifdef NDK_ROOT LOCAL_PATH := $(call my-dir) ################################################################################ @@ -52,3 +54,4 @@ LOCAL_STATIC_LIBRARIES := imageio_util LOCAL_MODULE := imageenc include $(BUILD_STATIC_LIBRARY) +endif # NDK_ROOT |