From 185b9f9792b9a101effc5b2827eff9f757cf4fd8 Mon Sep 17 00:00:00 2001
From: Jon Simantov <jsimantov@google.com>
Date: Tue, 30 Jun 2015 10:15:58 -0700
Subject: [PATCH] Allow customization of flatc cmdline arguments on Android.

On Android builds, set FLATBUFFERS_FLATC_ARGS to change the arguments
passed to the flatc cmdline. Do this in your Android makefile where
you include the flatbuffers include.mk (before or after).

For example FLATBUFFERS_FLATC_ARGS=--gen-mutable

The default value is --gen-includes although since that is deprecated
we could just make the default value blank.

Change-Id: I79fb35f50c3e21bbef18ad40ad3559cb026ffe8e
---
 android/jni/include.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/android/jni/include.mk b/android/jni/include.mk
index 5c16db98..45edf9d1 100644
--- a/android/jni/include.mk
+++ b/android/jni/include.mk
@@ -66,6 +66,8 @@ FLATBUFFERS_FLATC_PATH?=$(FLATBUFFERS_CMAKELISTS_DIR)
 FLATBUFFERS_FLATC := $(FLATBUFFERS_FLATC_PATH)/Debug/flatc
 endif
 
+FLATBUFFERS_FLATC_ARGS?=--gen-includes
+
 # Search for cmake.
 CMAKE_ROOT := $(realpath $(LOCAL_PATH)/../../../../../../prebuilts/cmake)
 ifeq (,$(CMAKE))
@@ -149,7 +151,7 @@ $(eval \
   $(call flatbuffers_fbs_to_h,$(2),$(3),$(1)): $(1) $(flatc_target)
 	$(call host-echo-build-step,generic,Generate) \
 		$(subst $(LOCAL_PATH)/,,$(call flatbuffers_fbs_to_h,$(2),$(3),$(1)))
-	$(hide) $$(FLATBUFFERS_FLATC) --gen-includes \
+	$(hide) $$(FLATBUFFERS_FLATC) $(FLATBUFFERS_FLATC_ARGS) \
 	  $(foreach include,$(4),-I $(include)) -o $$(dir $$@) -c $$<)
 endef
 
-- 
GitLab