diff options
author | Yifan Hong | 2018-03-29 12:51:48 -0500 |
---|---|---|
committer | Yifan Hong | 2018-03-29 13:29:32 -0500 |
commit | 7831d437d4e389083ae022a73a9f64d2cdd69a3a (patch) | |
tree | 2172dcbfe20d705e97c8837ffcc4a1842207ecd4 | |
parent | 5b99454bc4731eb787da2f60e323c56dde328b9a (diff) | |
download | platform-hardware-interfaces-7831d437d4e389083ae022a73a9f64d2cdd69a3a.tar.gz platform-hardware-interfaces-7831d437d4e389083ae022a73a9f64d2cdd69a3a.tar.xz platform-hardware-interfaces-7831d437d4e389083ae022a73a9f64d2cdd69a3a.zip |
matrix: define LOCAL_MODULE for all modules.
Test: m framework_compatibility_matrix -j
Bug: 65028233
Change-Id: Iab61771b8ebe0e1b771404bb25a0a04caf399585
-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 a10d808d..35a390a9 100644 --- a/compatibility_matrices/Android.mk +++ b/compatibility_matrices/Android.mk | |||
@@ -30,18 +30,21 @@ LOCAL_GEN_FILE_DEPENDENCIES := | |||
30 | 30 | ||
31 | 31 | ||
32 | include $(CLEAR_VARS) | 32 | include $(CLEAR_VARS) |
33 | LOCAL_MODULE := framework_compatibility_matrix.legacy.xml | ||
33 | LOCAL_MODULE_STEM := compatibility_matrix.legacy.xml | 34 | LOCAL_MODULE_STEM := compatibility_matrix.legacy.xml |
34 | LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) | 35 | LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) |
35 | LOCAL_KERNEL_VERSIONS := 3.18.0 4.4.0 4.9.0 | 36 | LOCAL_KERNEL_VERSIONS := 3.18.0 4.4.0 4.9.0 |
36 | include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) | 37 | include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) |
37 | 38 | ||
38 | include $(CLEAR_VARS) | 39 | include $(CLEAR_VARS) |
40 | LOCAL_MODULE := framework_compatibility_matrix.1.xml | ||
39 | LOCAL_MODULE_STEM := compatibility_matrix.1.xml | 41 | LOCAL_MODULE_STEM := compatibility_matrix.1.xml |
40 | LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) | 42 | LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) |
41 | LOCAL_KERNEL_VERSIONS := 3.18.0 4.4.0 4.9.0 | 43 | LOCAL_KERNEL_VERSIONS := 3.18.0 4.4.0 4.9.0 |
42 | include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) | 44 | include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) |
43 | 45 | ||
44 | include $(CLEAR_VARS) | 46 | include $(CLEAR_VARS) |
47 | LOCAL_MODULE := framework_compatibility_matrix.2.xml | ||
45 | LOCAL_MODULE_STEM := compatibility_matrix.2.xml | 48 | LOCAL_MODULE_STEM := compatibility_matrix.2.xml |
46 | LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) | 49 | LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) |
47 | LOCAL_KERNEL_VERSIONS := 3.18.0 4.4.0 4.9.0 | 50 | LOCAL_KERNEL_VERSIONS := 3.18.0 4.4.0 4.9.0 |
@@ -50,6 +53,7 @@ include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) | |||
50 | # TODO(b/72409164): STOPSHIP: update kernel version requirements | 53 | # TODO(b/72409164): STOPSHIP: update kernel version requirements |
51 | 54 | ||
52 | include $(CLEAR_VARS) | 55 | include $(CLEAR_VARS) |
56 | LOCAL_MODULE := framework_compatibility_matrix.current.xml | ||
53 | LOCAL_MODULE_STEM := compatibility_matrix.current.xml | 57 | LOCAL_MODULE_STEM := compatibility_matrix.current.xml |
54 | LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) | 58 | LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) |
55 | LOCAL_KERNEL_VERSIONS := 4.4.0 4.9.0 | 59 | LOCAL_KERNEL_VERSIONS := 4.4.0 4.9.0 |
@@ -58,9 +62,9 @@ include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) | |||
58 | # Framework Compatibility Matrix (common to all FCM versions) | 62 | # Framework Compatibility Matrix (common to all FCM versions) |
59 | 63 | ||
60 | include $(CLEAR_VARS) | 64 | include $(CLEAR_VARS) |
61 | LOCAL_MODULE_STEM := compatibility_matrix.device.xml | ||
62 | # define LOCAL_MODULE and LOCAL_MODULE_CLASS for local-generated-sources-dir. | ||
63 | LOCAL_MODULE := framework_compatibility_matrix.device.xml | 65 | LOCAL_MODULE := framework_compatibility_matrix.device.xml |
66 | LOCAL_MODULE_STEM := compatibility_matrix.device.xml | ||
67 | # define LOCAL_MODULE_CLASS for local-generated-sources-dir. | ||
64 | LOCAL_MODULE_CLASS := ETC | 68 | LOCAL_MODULE_CLASS := ETC |
65 | 69 | ||
66 | ifndef DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE | 70 | ifndef DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE |
diff --git a/compatibility_matrices/compatibility_matrix.mk b/compatibility_matrices/compatibility_matrix.mk index abc67965..2d6c5d00 100644 --- a/compatibility_matrices/compatibility_matrix.mk +++ b/compatibility_matrices/compatibility_matrix.mk | |||
@@ -25,12 +25,12 @@ endef | |||
25 | 25 | ||
26 | # $(warning $(call remove-minor-revision,3.18.0)) | 26 | # $(warning $(call remove-minor-revision,3.18.0)) |
27 | 27 | ||
28 | ifndef LOCAL_MODULE_STEM | 28 | ifndef LOCAL_MODULE |
29 | $(error LOCAL_MODULE_STEM must be defined.) | 29 | $(error LOCAL_MODULE must be defined.) |
30 | endif | 30 | endif |
31 | 31 | ||
32 | ifndef LOCAL_MODULE | 32 | ifndef LOCAL_MODULE_STEM |
33 | LOCAL_MODULE := framework_$(LOCAL_MODULE_STEM) | 33 | LOCAL_MODULE_STEM := $(LOCAL_MODULE) |
34 | endif | 34 | endif |
35 | 35 | ||
36 | ifndef LOCAL_MODULE_CLASS | 36 | ifndef LOCAL_MODULE_CLASS |