commit 818a6a67b96539eb2551b07733c8d07b569e307b
author Treehugger Robot <treehugger-gerrit@google.com> Mon May 20 17:05:43 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 20 17:05:43 2019 +0000
tree 3d36dca6af3f5029662725e6c6cd9938bc4767f0
parent 36e84957d3ef9a344044728327425d9b5bf2949b
parent 87fabf395dea07d71619245ae79af03e3fcb5ab2

Merge "Place compat tests in intermediates dir, not on /system"

compat.mk

diff --git a/compat.mk b/compat.mk
index b4f8de0..8594751 100644
--- a/compat.mk
+++ b/compat.mk
@@ -6,10 +6,7 @@
 #
 LOCAL_MODULE := $(version)_compat_test
 LOCAL_REQUIRED_MODULES := $(version).compat.cil
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_TAGS := tests
-
-include $(BUILD_SYSTEM)/base_rules.mk
+intermediates := $(TARGET_OUT_INTERMEDIATES)/ETC/sepolicy_intermediates
 
 all_cil_files := \
     $(built_plat_cil) \
@@ -29,12 +26,16 @@
 all_cil_files += $(built_odm_cil)
 endif
 
-$(LOCAL_BUILT_MODULE): PRIVATE_CIL_FILES := $(all_cil_files)
-$(LOCAL_BUILT_MODULE): $(HOST_OUT_EXECUTABLES)/secilc $(HOST_OUT_EXECUTABLES)/sepolicy-analyze $(all_cil_files)
+compat_test := $(intermediates)/$(LOCAL_MODULE)
+droidcore: $(compat_test)
+$(version)_compat_test: $(compat_test)
+.PHONY: $(version)_compat_test
+$(compat_test): PRIVATE_CIL_FILES := $(all_cil_files)
+$(compat_test): $(HOST_OUT_EXECUTABLES)/secilc $(HOST_OUT_EXECUTABLES)/sepolicy-analyze $(all_cil_files)
 	@mkdir -p $(dir $@)
-	$(hide) $< -m -N -M true -G -c $(POLICYVERS) $(PRIVATE_CIL_FILES) -o $@.tmp -f /dev/null
-	$(hide) mv $@.tmp $@
+	$(hide) $< -m -N -M true -G -c $(POLICYVERS) $(PRIVATE_CIL_FILES) -o $@ -f /dev/null
 
+compat_test :=
 all_cil_files :=
 version :=
 version_under_treble_tests :=