commit 6a90210c62a76925827fd65f5e7e96318eb9ac5a
author Mathieu Chartier <mathieuc@google.com> Fri Jun 23 10:44:45 2017 -0700
committer Mathieu Chartier <mathieuc@google.com> Fri Jun 23 13:20:47 2017 -0700
tree e870ce22e805df01a6477d36dfc6631a64ef501c
parent dacde83555ae1a158da01c75ba187b6c2fe52a5d

Add product system server compiler filter property

The product only needs to specify
PRODUCT_SYSTEM_SERVER_COMPILER_FILTER. This determines what compiler
filter system server jars are compiled with.

Test: update marlin device
Test: make and look at services.odex

Bug: 62356545

Change-Id: Id51726ae03576d7b4eb784b861158bb451c39deb

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index a70274c..b30a70b 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -227,6 +227,11 @@
   endif
 endif
 
+# Add the system server compiler filter if they are specified for the product.
+ifneq (,$(PRODUCT_SYSTEM_SERVER_COMPILER_FILTER))
+ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.systemservercompilerfilter=$(PRODUCT_SYSTEM_SERVER_COMPILER_FILTER)
+endif
+
 ## user/userdebug ##
 
 user_variant := $(filter user userdebug,$(TARGET_BUILD_VARIANT))