Skip to content

Commit

Permalink
pixel-additional: Merge separated extract scripts into one
Browse files Browse the repository at this point in the history
Change-Id: I7b9f196f6248c542d3e68c4f6070cac285df89fe
  • Loading branch information
someone5678 committed Oct 8, 2024
1 parent e978bf0 commit 49eafb9
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 112 deletions.
69 changes: 0 additions & 69 deletions extract-files-radio.sh

This file was deleted.

7 changes: 7 additions & 0 deletions extract-files.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@ extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTIO

"${MY_DIR}/setup-makefiles.sh"

# Initialize the helper
setup_vendor "radio" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"

extract "${MY_DIR}/proprietary-files-radio.txt" "${SRC}" "${KANG}" --section "${SECTION}"

"${MY_DIR}/setup-makefiles.sh"

echo "Waiting for extraction"
wait
echo "All done"
43 changes: 0 additions & 43 deletions setup-makefiles-radio.sh

This file was deleted.

16 changes: 16 additions & 0 deletions setup-makefiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,19 @@ write_footers

# Exclusions
sed -i '/libpowerstatshaldataprovider/d' "${ANDROID_ROOT}/vendor/google/pixel-additional/common/common-vendor.mk"

# Initialize the helper
setup_vendor "radio" "${VENDOR}" "${ANDROID_ROOT}" true

# Warning headers and guards
write_headers "arm64"
sed -i 's|TARGET_DEVICE|TARGET_ARCH|g' "${ANDROIDMK}"
sed -i 's|vendor/google/pixel-additional/|vendor/google/pixel-additional/common|g' "${PRODUCTMK}"
sed -i 's|device/google/pixel-additional//setup-makefiles.sh|vendor/google/pixel-additional/setup-makefiles.sh|g' "${ANDROIDBP}" "${ANDROIDMK}" "${BOARDMK}" "${PRODUCTMK}"

write_makefiles "${MY_DIR}/proprietary-files-radio.txt" true

# Finish
write_footers

cp -rf ${MY_DIR}/radiovendormk.txt ${MY_DIR}/radio/radio-vendor.mk

0 comments on commit 49eafb9

Please sign in to comment.