diff options
| author | Jeff Vander Stoep | 2017-10-04 14:05:28 -0500 |
|---|---|---|
| committer | android-build-merger | 2017-10-04 14:05:28 -0500 |
| commit | be60f71fe24be829d3f0731e9955dcddf7848786 (patch) | |
| tree | ed8030c1cedc1fc11dd2cf8e2659ae5b22be43ed /Android.mk | |
| parent | a09b3b4f5d87d67d05aa20160e8f6aa398f623ed (diff) | |
| parent | a6b8f4b1da1f61c191a891b076b5e6f667f82b67 (diff) | |
| download | system-sepolicy-be60f71fe24be829d3f0731e9955dcddf7848786.tar.gz system-sepolicy-be60f71fe24be829d3f0731e9955dcddf7848786.tar.xz system-sepolicy-be60f71fe24be829d3f0731e9955dcddf7848786.zip | |
Merge "Move python sepolicy tests to embedded launcher" am: 1e8804101b am: f2d1003c96
am: a6b8f4b1da
Change-Id: Ic64d56e86e455c8cb5e814c359aaee568618d7e0
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -1188,7 +1188,7 @@ $(sepolicy_tests): PRIVATE_SEPOLICY := $(built_sepolicy) | |||
| 1188 | $(sepolicy_tests): $(HOST_OUT_EXECUTABLES)/sepolicy_tests \ | 1188 | $(sepolicy_tests): $(HOST_OUT_EXECUTABLES)/sepolicy_tests \ |
| 1189 | $(built_plat_fc) $(built_nonplat_fc) $(built_sepolicy) | 1189 | $(built_plat_fc) $(built_nonplat_fc) $(built_sepolicy) |
| 1190 | @mkdir -p $(dir $@) | 1190 | @mkdir -p $(dir $@) |
| 1191 | $(hide) python $(HOST_OUT_EXECUTABLES)/sepolicy_tests -l $(HOST_OUT)/lib64 -f $(PRIVATE_PLAT_FC) -f $(PRIVATE_NONPLAT_FC) -p $(PRIVATE_SEPOLICY) | 1191 | $(hide) $(HOST_OUT_EXECUTABLES)/sepolicy_tests -l $(HOST_OUT)/lib64 -f $(PRIVATE_PLAT_FC) -f $(PRIVATE_NONPLAT_FC) -p $(PRIVATE_SEPOLICY) |
| 1192 | $(hide) touch $@ | 1192 | $(hide) touch $@ |
| 1193 | 1193 | ||
| 1194 | ################################## | 1194 | ################################## |
| @@ -1304,7 +1304,7 @@ $(treble_sepolicy_tests): $(HOST_OUT_EXECUTABLES)/treble_sepolicy_tests \ | |||
| 1304 | $(built_plat_fc) $(built_nonplat_fc) $(built_sepolicy) $(built_plat_sepolicy) \ | 1304 | $(built_plat_fc) $(built_nonplat_fc) $(built_sepolicy) $(built_plat_sepolicy) \ |
| 1305 | $(built_26.0_plat_sepolicy) $(26.0_compat) $(26.0_mapping.combined.cil) | 1305 | $(built_26.0_plat_sepolicy) $(26.0_compat) $(26.0_mapping.combined.cil) |
| 1306 | @mkdir -p $(dir $@) | 1306 | @mkdir -p $(dir $@) |
| 1307 | $(hide) python $(HOST_OUT_EXECUTABLES)/treble_sepolicy_tests -l \ | 1307 | $(hide) $(HOST_OUT_EXECUTABLES)/treble_sepolicy_tests -l \ |
| 1308 | $(HOST_OUT)/lib64 -f $(PRIVATE_PLAT_FC) -f $(PRIVATE_NONPLAT_FC) \ | 1308 | $(HOST_OUT)/lib64 -f $(PRIVATE_PLAT_FC) -f $(PRIVATE_NONPLAT_FC) \ |
| 1309 | -b $(PRIVATE_PLAT_SEPOLICY) -m $(PRIVATE_COMBINED_MAPPING) \ | 1309 | -b $(PRIVATE_PLAT_SEPOLICY) -m $(PRIVATE_COMBINED_MAPPING) \ |
| 1310 | -o $(PRIVATE_SEPOLICY_OLD) -p $(PRIVATE_SEPOLICY) \ | 1310 | -o $(PRIVATE_SEPOLICY_OLD) -p $(PRIVATE_SEPOLICY) \ |