Skip to content

Commit

Permalink
z2_plus: Update extractors to use Lineage vendor
Browse files Browse the repository at this point in the history
 * Match the branding change as well

Change-Id: Ie39f8f52f3a7d552c82c0da643732af447aeb91e
Signed-off-by: dd3boh <[email protected]>
  • Loading branch information
bgcngm authored and DD3Boh committed Oct 31, 2017
1 parent 191db40 commit 4b2b978
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions extract-files.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ export DEVICE_BRINGUP_YEAR=2016
MY_DIR="${BASH_SOURCE%/*}"
if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi

CM_ROOT="$MY_DIR"/../../..
LINEAGE_ROOT="$MY_DIR"/../../..

HELPER="$CM_ROOT"/vendor/cm/build/tools/extract_utils.sh
HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh
if [ ! -f "$HELPER" ]; then
echo "Unable to find helper script at $HELPER"
exit 1
Expand Down Expand Up @@ -60,13 +60,13 @@ if [ -z "$SRC" ]; then
fi

# Initialize the helper for common device
setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT" true "$CLEAN_VENDOR"
setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" true "$CLEAN_VENDOR"

extract "$MY_DIR"/proprietary-files.txt "$SRC" "$SECTION"

if [ -s "$MY_DIR"/../$DEVICE/proprietary-files.txt ]; then
# Reinitialize the helper for device
setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT" false "$CLEAN_VENDOR"
setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" false "$CLEAN_VENDOR"

extract "$MY_DIR"/../$DEVICE/proprietary-files.txt "$SRC" "$SECTION"
fi
Expand Down
8 changes: 4 additions & 4 deletions setup-makefiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ INITIAL_COPYRIGHT_YEAR=2017
MY_DIR="${BASH_SOURCE%/*}"
if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi

CM_ROOT="$MY_DIR"/../../..
LINEAGE_ROOT="$MY_DIR"/../../..

HELPER="$CM_ROOT"/vendor/cm/build/tools/extract_utils.sh
HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh
if [ ! -f "$HELPER" ]; then
echo "Unable to find helper script at $HELPER"
exit 1
fi
. "$HELPER"

# Initialize the helper for common
setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT" true
setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" true

# Copyright headers and guards
write_headers "z2_plus"
Expand All @@ -54,7 +54,7 @@ write_footers
if [ -s "$MY_DIR"/../"$DEVICE"/proprietary-files.txt ]; then
# Reinitialize the helper for device
INITIAL_COPYRIGHT_YEAR="$DEVICE_BRINGUP_YEAR"
setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT" false
setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" false

# Copyright headers and guards
write_headers
Expand Down

0 comments on commit 4b2b978

Please sign in to comment.