commit 6228ec2d0768ffd25f7e60e70b82d8b5a067e9f9
author Mathieu Chartier <mathieuc@google.com> Fri Jun 23 10:44:45 2017 -0700
committer Andreas Gampe <agampe@google.com> Fri Jul 28 11:17:17 2017 -0700
tree 62ff5102e7a4282abc32a212c09b6e5be39e791e
parent abcf66b5385063aba865f638f6d7afef717ec20c

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.

(cherry picked from commit 6a90210c62a76925827fd65f5e7e96318eb9ac5a)

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

Bug: 62356545

Merged-In: Id51726ae03576d7b4eb784b861158bb451c39deb
Change-Id: Id51726ae03576d7b4eb784b861158bb451c39deb

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index d14d64b..3161cc7 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -214,6 +214,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))