summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifan Hong2018-03-29 12:51:48 -0500
committerYifan Hong2018-03-29 13:29:32 -0500
commit7831d437d4e389083ae022a73a9f64d2cdd69a3a (patch)
tree2172dcbfe20d705e97c8837ffcc4a1842207ecd4
parent5b99454bc4731eb787da2f60e323c56dde328b9a (diff)
downloadplatform-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.mk8
-rw-r--r--compatibility_matrices/compatibility_matrix.mk8
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
32include $(CLEAR_VARS) 32include $(CLEAR_VARS)
33LOCAL_MODULE := framework_compatibility_matrix.legacy.xml
33LOCAL_MODULE_STEM := compatibility_matrix.legacy.xml 34LOCAL_MODULE_STEM := compatibility_matrix.legacy.xml
34LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) 35LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM)
35LOCAL_KERNEL_VERSIONS := 3.18.0 4.4.0 4.9.0 36LOCAL_KERNEL_VERSIONS := 3.18.0 4.4.0 4.9.0
36include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) 37include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)
37 38
38include $(CLEAR_VARS) 39include $(CLEAR_VARS)
40LOCAL_MODULE := framework_compatibility_matrix.1.xml
39LOCAL_MODULE_STEM := compatibility_matrix.1.xml 41LOCAL_MODULE_STEM := compatibility_matrix.1.xml
40LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) 42LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM)
41LOCAL_KERNEL_VERSIONS := 3.18.0 4.4.0 4.9.0 43LOCAL_KERNEL_VERSIONS := 3.18.0 4.4.0 4.9.0
42include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) 44include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)
43 45
44include $(CLEAR_VARS) 46include $(CLEAR_VARS)
47LOCAL_MODULE := framework_compatibility_matrix.2.xml
45LOCAL_MODULE_STEM := compatibility_matrix.2.xml 48LOCAL_MODULE_STEM := compatibility_matrix.2.xml
46LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) 49LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM)
47LOCAL_KERNEL_VERSIONS := 3.18.0 4.4.0 4.9.0 50LOCAL_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
52include $(CLEAR_VARS) 55include $(CLEAR_VARS)
56LOCAL_MODULE := framework_compatibility_matrix.current.xml
53LOCAL_MODULE_STEM := compatibility_matrix.current.xml 57LOCAL_MODULE_STEM := compatibility_matrix.current.xml
54LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) 58LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM)
55LOCAL_KERNEL_VERSIONS := 4.4.0 4.9.0 59LOCAL_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
60include $(CLEAR_VARS) 64include $(CLEAR_VARS)
61LOCAL_MODULE_STEM := compatibility_matrix.device.xml
62# define LOCAL_MODULE and LOCAL_MODULE_CLASS for local-generated-sources-dir.
63LOCAL_MODULE := framework_compatibility_matrix.device.xml 65LOCAL_MODULE := framework_compatibility_matrix.device.xml
66LOCAL_MODULE_STEM := compatibility_matrix.device.xml
67# define LOCAL_MODULE_CLASS for local-generated-sources-dir.
64LOCAL_MODULE_CLASS := ETC 68LOCAL_MODULE_CLASS := ETC
65 69
66ifndef DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE 70ifndef 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
28ifndef LOCAL_MODULE_STEM 28ifndef LOCAL_MODULE
29$(error LOCAL_MODULE_STEM must be defined.) 29$(error LOCAL_MODULE must be defined.)
30endif 30endif
31 31
32ifndef LOCAL_MODULE 32ifndef LOCAL_MODULE_STEM
33LOCAL_MODULE := framework_$(LOCAL_MODULE_STEM) 33LOCAL_MODULE_STEM := $(LOCAL_MODULE)
34endif 34endif
35 35
36ifndef LOCAL_MODULE_CLASS 36ifndef LOCAL_MODULE_CLASS