diff options
| author | Yifan Hong <elsk@google.com> | 2018-03-29 10:51:48 -0700 |
|---|---|---|
| committer | Yifan Hong <elsk@google.com> | 2018-03-29 11:29:32 -0700 |
| commit | 7831d437d4e389083ae022a73a9f64d2cdd69a3a (patch) | |
| tree | 2172dcbfe20d705e97c8837ffcc4a1842207ecd4 /compatibility_matrices | |
| parent | 5b99454bc4731eb787da2f60e323c56dde328b9a (diff) | |
| download | android_hardware_interfaces-7831d437d4e389083ae022a73a9f64d2cdd69a3a.tar.gz android_hardware_interfaces-7831d437d4e389083ae022a73a9f64d2cdd69a3a.tar.bz2 android_hardware_interfaces-7831d437d4e389083ae022a73a9f64d2cdd69a3a.zip | |
matrix: define LOCAL_MODULE for all modules.
Test: m framework_compatibility_matrix -j
Bug: 65028233
Change-Id: Iab61771b8ebe0e1b771404bb25a0a04caf399585
Diffstat (limited to 'compatibility_matrices')
| -rw-r--r-- | compatibility_matrices/Android.mk | 8 | ||||
| -rw-r--r-- | compatibility_matrices/compatibility_matrix.mk | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk index a10d808d3..35a390a93 100644 --- a/compatibility_matrices/Android.mk +++ b/compatibility_matrices/Android.mk @@ -30,18 +30,21 @@ LOCAL_GEN_FILE_DEPENDENCIES := include $(CLEAR_VARS) +LOCAL_MODULE := framework_compatibility_matrix.legacy.xml LOCAL_MODULE_STEM := compatibility_matrix.legacy.xml LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) LOCAL_KERNEL_VERSIONS := 3.18.0 4.4.0 4.9.0 include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) include $(CLEAR_VARS) +LOCAL_MODULE := framework_compatibility_matrix.1.xml LOCAL_MODULE_STEM := compatibility_matrix.1.xml LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) LOCAL_KERNEL_VERSIONS := 3.18.0 4.4.0 4.9.0 include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) include $(CLEAR_VARS) +LOCAL_MODULE := framework_compatibility_matrix.2.xml LOCAL_MODULE_STEM := compatibility_matrix.2.xml LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) LOCAL_KERNEL_VERSIONS := 3.18.0 4.4.0 4.9.0 @@ -50,6 +53,7 @@ include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) # TODO(b/72409164): STOPSHIP: update kernel version requirements include $(CLEAR_VARS) +LOCAL_MODULE := framework_compatibility_matrix.current.xml LOCAL_MODULE_STEM := compatibility_matrix.current.xml LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) LOCAL_KERNEL_VERSIONS := 4.4.0 4.9.0 @@ -58,9 +62,9 @@ include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) # Framework Compatibility Matrix (common to all FCM versions) include $(CLEAR_VARS) -LOCAL_MODULE_STEM := compatibility_matrix.device.xml -# define LOCAL_MODULE and LOCAL_MODULE_CLASS for local-generated-sources-dir. LOCAL_MODULE := framework_compatibility_matrix.device.xml +LOCAL_MODULE_STEM := compatibility_matrix.device.xml +# define LOCAL_MODULE_CLASS for local-generated-sources-dir. LOCAL_MODULE_CLASS := ETC ifndef DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE diff --git a/compatibility_matrices/compatibility_matrix.mk b/compatibility_matrices/compatibility_matrix.mk index abc679656..2d6c5d005 100644 --- a/compatibility_matrices/compatibility_matrix.mk +++ b/compatibility_matrices/compatibility_matrix.mk @@ -25,12 +25,12 @@ endef # $(warning $(call remove-minor-revision,3.18.0)) -ifndef LOCAL_MODULE_STEM -$(error LOCAL_MODULE_STEM must be defined.) +ifndef LOCAL_MODULE +$(error LOCAL_MODULE must be defined.) endif -ifndef LOCAL_MODULE -LOCAL_MODULE := framework_$(LOCAL_MODULE_STEM) +ifndef LOCAL_MODULE_STEM +LOCAL_MODULE_STEM := $(LOCAL_MODULE) endif ifndef LOCAL_MODULE_CLASS |