diff options
| author | Isaac Chen <tingyi364@gmail.com> | 2019-09-27 16:54:29 +0200 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-04-30 00:48:53 +0300 |
| commit | 3ae1a4e9e722be6fb60643f7318c87e5f6ce0054 (patch) | |
| tree | 682d4187214ce92dfd46c98e136db89a63b1d70e | |
| parent | 6fb2a35571077f85a357c8407f4834b02229ae6e (diff) | |
sdm660-common: Add triple inherit support for extractor
Change-Id: I76f428b1761abb19025a5194e494481e30c53d59
Signed-off-by: Isaac Chen <tingyi364@gmail.com>
| -rwxr-xr-x | extract-files.sh | 7 | ||||
| -rwxr-xr-x | setup-makefiles.sh | 15 |
2 files changed, 22 insertions, 0 deletions
diff --git a/extract-files.sh b/extract-files.sh index 1536608..88517a6 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -79,6 +79,13 @@ setup_vendor "$DEVICE_COMMON" "$VENDOR" "$LINEAGE_ROOT" true $CLEAN_VENDOR extract "$MY_DIR"/proprietary-files.txt "$SRC" \ "${KANG}" --section "${SECTION}" +if [ -s "$MY_DIR"/../$DEVICE_SPECIFIED_COMMON/proprietary-files.txt ];then + # Reinitialize the helper for device specified common + setup_vendor "$DEVICE_SPECIFIED_COMMON" "$VENDOR" "$LINEAGE_ROOT" false "$CLEAN_VENDOR" + extract "$MY_DIR"/../$DEVICE_SPECIFIED_COMMON/proprietary-files.txt "$SRC" \ + "${KANG}" --section "${SECTION}" +fi + if [ -s "$MY_DIR"/../$DEVICE/proprietary-files.txt ]; then # Reinitialize the helper for device setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" false "$CLEAN_VENDOR" diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 34f8d52..f8cf02d 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -46,6 +46,21 @@ write_makefiles "$MY_DIR"/proprietary-files.txt true # Finish write_footers +if [ -s "$MY_DIR"/../$DEVICE_SPECIFIED_COMMON/proprietary-files.txt ]; then + # Reinitialize the helper for device specified common + INITIAL_COPYRIGHT_YEAR="$DEVICE_BRINGUP_YEAR" + setup_vendor "$DEVICE_SPECIFIED_COMMON" "$VENDOR" "$LINEAGE_ROOT" true + + # Copyright headers and guards + write_headers "$DEVICE_SPECIFIED_COMMON_DEVICE" + + # The standard device specified common blobs + write_makefiles "$MY_DIR"/../$DEVICE_SPECIFIED_COMMON/proprietary-files.txt true + + # We are done! + write_footers +fi + if [ -s "$MY_DIR"/../$DEVICE/proprietary-files.txt ]; then # Reinitialize the helper for device INITIAL_COPYRIGHT_YEAR="$DEVICE_BRINGUP_YEAR" |