Skip to content

vendor/fh: align with Lineage changes #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rpingat wants to merge 4 commits into
base: q10
Choose a base branch
from
Open

vendor/fh: align with Lineage changes #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd231d9
extract_utils: Fix bad substitution for zsh
xingrz Dec 24, 2019
f2652f0
extract_utils: Fix up 4a2b65fb60af23b6beccd8c405fc7cea90b9474d
aviraxp Mar 10, 2020
861736e
envsetup: s/wait-for-online/wait-for-device-recovery/g
luca020400 Mar 11, 2020
470da58
Always build adb_root
luca020400 Mar 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions build/envsetup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ function eat()
return 1
fi
echo "Waiting for device..."
adb wait-for-online
adb wait-for-device-recovery
echo "Found device"
if (adb shell getprop ro.lineage.device | grep -q "$LINEAGE_BUILD"); then
echo "Rebooting to sideload for install"
Expand Down Expand Up @@ -364,9 +364,9 @@ function installboot()
return 1
fi
fi
adb wait-for-online
adb wait-for-device-recovery
adb root
adb wait-for-online
adb wait-for-device-recovery
if (adb shell getprop ro.lineage.device | grep -q "$LINEAGE_BUILD");
then
adb push $OUT/boot.img /cache/
Expand Down Expand Up @@ -402,9 +402,9 @@ function installrecovery()
return 1
fi
fi
adb wait-for-online
adb wait-for-device-recovery
adb root
adb wait-for-online
adb wait-for-device-recovery
if (adb shell getprop ro.lineage.device | grep -q "$LINEAGE_BUILD");
then
adb push $OUT/recovery.img /cache/
Expand Down Expand Up @@ -804,7 +804,6 @@ function dopush()
adb connect "$TCPIPPORT"
fi
adb wait-for-device &> /dev/null
sleep 0.3
adb remount &> /dev/null

mkdir -p $OUT
Expand Down
6 changes: 3 additions & 3 deletions build/tools/extract_utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1190,19 +1190,19 @@ function oat2dex() {
local SRC="$3"
local TARGET=
local OAT=
local HOST="$(uname)"
local HOST="$(uname | tr '[:upper:]' '[:lower:]')"

if [ -z "$BAKSMALIJAR" ] || [ -z "$SMALIJAR" ]; then
export BAKSMALIJAR="$LINEAGE_ROOT"/prebuilts/tools-lineage/common/smali/baksmali.jar
export SMALIJAR="$LINEAGE_ROOT"/prebuilts/tools-lineage/common/smali/smali.jar
fi

if [ -z "$VDEXEXTRACTOR" ]; then
export VDEXEXTRACTOR="$LINEAGE_ROOT"/prebuilts/tools-lineage/"${HOST,,}"-x86/bin/vdexExtractor
export VDEXEXTRACTOR="$LINEAGE_ROOT"/prebuilts/tools-lineage/${HOST}-x86/bin/vdexExtractor
fi

if [ -z "$CDEXCONVERTER" ]; then
export CDEXCONVERTER="$LINEAGE_ROOT"/prebuilts/tools-lineage/"${HOST,,}"-x86/bin/compact_dex_converter
export CDEXCONVERTER="$LINEAGE_ROOT"/prebuilts/tools-lineage/${HOST}-x86/bin/compact_dex_converter
fi

# Extract existing boot.oats to the temp folder
Expand Down
4 changes: 2 additions & 2 deletions config/common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,10 +258,10 @@ PRODUCT_PACKAGES_DEBUG += \
PRODUCT_PROPERTY_OVERRIDES += \
ro.setupwizard.rotation_locked=true

# Conditionally build in su
ifneq ($(TARGET_BUILD_VARIANT),user)
# Root
PRODUCT_PACKAGES += \
adb_root
ifneq ($(TARGET_BUILD_VARIANT),user)
ifeq ($(WITH_SU),true)
PRODUCT_PACKAGES += \
su
Expand Down