commit f25e5550a7e18e101837cb42f235d57ec2eca56a
author Treehugger Robot <treehugger-gerrit@google.com> Mon Nov 21 23:16:53 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 21 23:16:53 2016 +0000
tree f489e4075d012eca4bee85f8d7a768b16f0e4c13
parent 5eadcb8cb1a302a12b5d445413dea1543981c501
parent 2899434716e069231d67133927bed25c9e27bcbc

Merge "Add WITH_DEXPREOPT_PIC to 'with_dexpreopt' SELinux macro."

Android.mk

diff --git a/Android.mk b/Android.mk
index 6af3af9..3eddee8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -140,6 +140,7 @@
 		-D target_build_variant=$(TARGET_BUILD_VARIANT) \
 		-D target_build_treble=$(ENABLE_TREBLE) \
 		-D target_with_dexpreopt=$(WITH_DEXPREOPT) \
+		-D target_with_dexpreopt_pic=$(WITH_DEXPREOPT_PIC) \
 		-s $^ > $@
 	$(hide) sed '/dontaudit/d' $@ > $@.dontaudit
 
@@ -158,6 +159,7 @@
 		-D target_build_variant=$(TARGET_BUILD_VARIANT) \
 		-D target_build_treble=$(ENABLE_TREBLE) \
 		-D target_with_dexpreopt=$(WITH_DEXPREOPT) \
+		-D target_with_dexpreopt_pic=$(WITH_DEXPREOPT_PIC) \
 		-D target_arch=$(LOCAL_TARGET_ARCH) \
 		-s $^ > $@
 	$(hide) sed '/dontaudit/d' $@ > $@.dontaudit
@@ -200,6 +202,7 @@
 		-D target_build_variant=$(TARGET_BUILD_VARIANT) \
 		-D target_build_treble=$(ENABLE_TREBLE) \
 		-D target_with_dexpreopt=$(WITH_DEXPREOPT) \
+		-D target_with_dexpreopt_pic=$(WITH_DEXPREOPT_PIC) \
 		-D target_recovery=true \
 		-s $^ > $@
 
@@ -237,6 +240,7 @@
 		-D target_build_variant=user \
 		-D target_build_treble=$(ENABLE_TREBLE) \
 		-D target_with_dexpreopt=$(WITH_DEXPREOPT) \
+		-D target_with_dexpreopt_pic=$(WITH_DEXPREOPT_PIC) \
 		-s $^ > $@
 	$(hide) sed '/dontaudit/d' $@ > $@.dontaudit
 

public/te_macros

diff --git a/public/te_macros b/public/te_macros
index 9664b31..a826e96 100644
--- a/public/te_macros
+++ b/public/te_macros
@@ -290,9 +290,9 @@
 
 #####################################
 # WITH_DEXPREOPT builds
-# SELinux rules which apply only when pre-opting.
+# SELinux rules which apply only when pre-opting with PIC.
 #
-define(`with_dexpreopt', ifelse(target_with_dexpreopt, `true', $1))
+define(`with_dexpreopt', ifelse(target_with_dexpreopt, `true', ifelse(target_with_dexpreopt_pic, `true', $1)))
 
 #####################################
 # write_logd(domain)