commit d733d161cfd7b73e3d3087ca086abb646790fd1b
author Jeff Vander Stoep <jeffv@google.com> Wed Oct 19 13:55:21 2016 -0700
committer Jeff Vander Stoep <jeffv@google.com> Wed Oct 19 15:05:05 2016 -0700
tree fc09e275d5307fc0017a95a9c75d2ad140148b92
parent c86eb96f457c3313ffeceae6863a81e0477eb1e4

Add macros for treble and non-treble only policy

Test: builds
Change-Id: Idd1d90a89a9ecbb2738d6b483af0e8479e87aa15

Android.mk

diff --git a/Android.mk b/Android.mk
index 7bfe1a7..fb2a602 100644
--- a/Android.mk
+++ b/Android.mk
@@ -138,6 +138,7 @@
 	$(hide) m4 $(PRIVATE_ADDITIONAL_M4DEFS) \
 		-D mls_num_sens=$(PRIVATE_MLS_SENS) -D mls_num_cats=$(PRIVATE_MLS_CATS) \
 		-D target_build_variant=$(TARGET_BUILD_VARIANT) \
+		-D target_build_treble=$(ENABLE_TREBLE) \
 		-s $^ > $@
 	$(hide) sed '/dontaudit/d' $@ > $@.dontaudit
 
@@ -154,6 +155,7 @@
 	$(hide) m4 $(PRIVATE_ADDITIONAL_M4DEFS) \
 		-D mls_num_sens=$(PRIVATE_MLS_SENS) -D mls_num_cats=$(PRIVATE_MLS_CATS) \
 		-D target_build_variant=$(TARGET_BUILD_VARIANT) \
+		-D target_build_treble=$(ENABLE_TREBLE) \
 		-D target_arch=$(LOCAL_TARGET_ARCH) \
 		-s $^ > $@
 	$(hide) sed '/dontaudit/d' $@ > $@.dontaudit
@@ -194,6 +196,7 @@
 	$(hide) m4 $(PRIVATE_ADDITIONAL_M4DEFS) \
 		-D mls_num_sens=$(PRIVATE_MLS_SENS) -D mls_num_cats=$(PRIVATE_MLS_CATS) \
 		-D target_build_variant=$(TARGET_BUILD_VARIANT) \
+		-D target_build_treble=$(ENABLE_TREBLE) \
 		-D target_recovery=true \
 		-s $^ > $@
 
@@ -229,6 +232,7 @@
 	mkdir -p $(dir $@)
 	$(hide) m4 -D mls_num_sens=$(PRIVATE_MLS_SENS) -D mls_num_cats=$(PRIVATE_MLS_CATS) \
 		-D target_build_variant=user \
+		-D target_build_treble=$(ENABLE_TREBLE) \
 		-s $^ > $@
 	$(hide) sed '/dontaudit/d' $@ > $@.dontaudit