From 552fb537129e9b446e79af53216c08d15e69144e Mon Sep 17 00:00:00 2001 From: Dan Cashman <dcashman@google.com> Date: Wed, 12 Apr 2017 14:04:17 -0700 Subject: [PATCH] Fix build: encase $(platform_mapping_file) module in treble block. Specifying an empty module causes a build error, so make sure that if there is no $(platform_mapping_file) the MODULE is not included. Test: Makefiles parsed without error. Change-Id: Ie99e6534c388a3d42bf90cdfef5ee64d5c640fa0 --- Android.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Android.mk b/Android.mk index 2c77d2f2e..0cd642caf 100644 --- a/Android.mk +++ b/Android.mk @@ -343,6 +343,7 @@ $(LOCAL_BUILT_MODULE) : echo $(PRIVATE_PLAT_SEPOL_VERS) > $@ ################################# +ifeq ($(PRODUCT_FULL_TREBLE),true) include $(CLEAR_VARS) LOCAL_MODULE := $(platform_mapping_file) @@ -376,6 +377,7 @@ $(LOCAL_BUILT_MODULE): $(mapping_policy_nvr) built_mapping_cil := $(LOCAL_BUILT_MODULE) current_mapping.cil := +endif # ifeq ($(PRODUCT_FULL_TREBLE),true) ################################# include $(CLEAR_VARS) -- GitLab