diff options
| author | Yifan Hong <elsk@google.com> | 2018-02-02 12:47:48 -0800 |
|---|---|---|
| committer | Yifan Hong <elsk@google.com> | 2018-02-05 13:45:36 -0800 |
| commit | b426af39ad528020a687e5ccef7260953e332b0e (patch) | |
| tree | 264680f22c2821fc458845d0d40fc657db796780 | |
| parent | 2ea233becbb380539823437fac3f469b644c51e1 (diff) | |
| download | android_hardware_interfaces-b426af39ad528020a687e5ccef7260953e332b0e.tar.gz android_hardware_interfaces-b426af39ad528020a687e5ccef7260953e332b0e.tar.bz2 android_hardware_interfaces-b426af39ad528020a687e5ccef7260953e332b0e.zip | |
Fwk matrix use PLATFORM_SEPOLICY_*
It used BOARD_SEPOLICY_VERS as a workaround, which is incorrect.
Test: m framework_compatibility_matrix.xml -j
Bug: 67920434
Change-Id: I029edd2f573740af272f8b767bb1ec5cc1dc0415
| -rw-r--r-- | compatibility_matrices/Android.mk | 5 | ||||
| -rw-r--r-- | compatibility_matrices/compatibility_matrix.mk | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk index 1c86f1108..71253dac7 100644 --- a/compatibility_matrices/Android.mk +++ b/compatibility_matrices/Android.mk @@ -61,8 +61,9 @@ LOCAL_MODULE_STEM := compatibility_matrix.empty.xml LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) LOCAL_ADD_VBMETA_VERSION := true LOCAL_ASSEMBLE_VINTF_ENV_VARS := \ - POLICYVERS \ - BOARD_SEPOLICY_VERS + POLICYVERS \ + PLATFORM_SEPOLICY_VERSION \ + PLATFORM_SEPOLICY_COMPAT_VERSIONS include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) diff --git a/compatibility_matrices/compatibility_matrix.mk b/compatibility_matrices/compatibility_matrix.mk index 14c60ab97..96815b83e 100644 --- a/compatibility_matrices/compatibility_matrix.mk +++ b/compatibility_matrices/compatibility_matrix.mk @@ -78,7 +78,7 @@ my_matrix_src_files := \ $(GEN): PRIVATE_SRC_FILES := $(my_matrix_src_files) $(GEN): $(my_matrix_src_files) $(HOST_OUT_EXECUTABLES)/assemble_vintf - $(foreach varname,$(PRIVATE_ENV_VARS),$(varname)=$($(varname))) \ + $(foreach varname,$(PRIVATE_ENV_VARS),$(varname)="$($(varname))") \ $(HOST_OUT_EXECUTABLES)/assemble_vintf \ -i $(call normalize-path-list,$(PRIVATE_SRC_FILES)) \ -o $@ \ |