diff --git a/a10/setup.sh b/a10/setup.sh deleted file mode 100755 index 634ef92..0000000 --- a/a10/setup.sh +++ /dev/null @@ -1,22 +0,0 @@ -VENDOR=$(cat device/samsung/universal7885-common/vendor_name) -if [ ! $VENDOR ]; then -VENDOR=aosp; -fi -# Generate AndroidProducts.mk -echo "# Auto-Generated by device/samsung/a10/setup.sh" > device/samsung/a10/AndroidProducts.mk -echo "PRODUCT_MAKEFILES += \$(LOCAL_DIR)/"$VENDOR"_a10.mk" >> device/samsung/a10/AndroidProducts.mk - -# Generate _a10.mk -echo "# Auto-Generated by device/samsung/a10/setup.sh" > device/samsung/a10/"$VENDOR"_a10.mk -echo "\$(call inherit-product, device/samsung/a10/full_a10.mk)" >> device/samsung/a10/"$VENDOR"_a10.mk -if test -f vendor/"$VENDOR"/config/common_full_phone.mk && echo "common_full_phone"; then - echo "\$(call inherit-product, vendor/"$VENDOR"/config/common_full_phone.mk)" >> device/samsung/a10/"$VENDOR"_a10.mk -elif test -f vendor/"$VENDOR"/config/common.mk && echo "common"; then - echo "\$(call inherit-product, vendor/"$VENDOR"/config/common.mk)" >> device/samsung/a10/"$VENDOR"_a10.mk -fi -echo "PRODUCT_NAME := "$VENDOR"_a10" >> device/samsung/a10/"$VENDOR"_a10.mk -echo "" >> device/samsung/a10/"$VENDOR"_a10.mk -echo "# Additional Props" >> device/samsung/a10/"$VENDOR"_a10.mk -echo "TARGET_FACE_UNLOCK_SUPPORTED := true" >> device/samsung/a10/"$VENDOR"_a10.mk -echo "TARGET_BOOT_ANIMATION_RES := 720" >> device/samsung/a10/"$VENDOR"_a10.mk - diff --git a/a10dd/setup.sh b/a10dd/setup.sh deleted file mode 100755 index 4765156..0000000 --- a/a10dd/setup.sh +++ /dev/null @@ -1,22 +0,0 @@ -VENDOR=$(cat device/samsung/universal7885-common/vendor_name) -if [ ! $VENDOR ]; then -VENDOR=aosp; -fi -# Generate AndroidProducts.mk -echo "# Auto-Generated by device/samsung/a10dd/setup.sh" > device/samsung/a10dd/AndroidProducts.mk -echo "PRODUCT_MAKEFILES += \$(LOCAL_DIR)/"$VENDOR"_a10dd.mk" >> device/samsung/a10dd/AndroidProducts.mk - -# Generate _a10dd.mk -echo "# Auto-Generated by device/samsung/a10dd/setup.sh" > device/samsung/a10dd/"$VENDOR"_a10dd.mk -echo "\$(call inherit-product, device/samsung/a10dd/full_a10dd.mk)" >> device/samsung/a10dd/"$VENDOR"_a10dd.mk -if test -f vendor/"$VENDOR"/config/common_full_phone.mk && echo "common_full_phone"; then - echo "\$(call inherit-product, vendor/"$VENDOR"/config/common_full_phone.mk)" >> device/samsung/a10dd/"$VENDOR"_a10dd.mk -elif test -f vendor/"$VENDOR"/config/common.mk && echo "common"; then - echo "\$(call inherit-product, vendor/"$VENDOR"/config/common.mk)" >> device/samsung/a10dd/"$VENDOR"_a10dd.mk -fi -echo "PRODUCT_NAME := "$VENDOR"_a10dd" >> device/samsung/a10dd/"$VENDOR"_a10dd.mk -echo "" >> device/samsung/a10dd/"$VENDOR"_a10dd.mk -echo "# Additional Props" >> device/samsung/a10dd/"$VENDOR"_a10dd.mk -echo "TARGET_FACE_UNLOCK_SUPPORTED := true" >> device/samsung/a10dd/"$VENDOR"_a10dd.mk -echo "TARGET_BOOT_ANIMATION_RES := 720" >> device/samsung/a10dd/"$VENDOR"_a10dd.mk - diff --git a/a20/setup.sh b/a20/setup.sh deleted file mode 100755 index a7532cd..0000000 --- a/a20/setup.sh +++ /dev/null @@ -1,22 +0,0 @@ -VENDOR=$(cat device/samsung/universal7885-common/vendor_name) -if [ ! $VENDOR ]; then -VENDOR=aosp; -fi -# Generate AndroidProducts.mk -echo "# Auto-Generated by device/samsung/a20/setup.sh" > device/samsung/a20/AndroidProducts.mk -echo "PRODUCT_MAKEFILES += \$(LOCAL_DIR)/"$VENDOR"_a20.mk" >> device/samsung/a20/AndroidProducts.mk - -# Generate _a20.mk -echo "# Auto-Generated by device/samsung/a20/setup.sh" > device/samsung/a20/"$VENDOR"_a20.mk -echo "\$(call inherit-product, device/samsung/a20/full_a20.mk)" >> device/samsung/a20/"$VENDOR"_a20.mk -if test -f vendor/"$VENDOR"/config/common_full_phone.mk && echo "common_full_phone"; then - echo "\$(call inherit-product, vendor/"$VENDOR"/config/common_full_phone.mk)" >> device/samsung/a20/"$VENDOR"_a20.mk -elif test -f vendor/"$VENDOR"/config/common.mk && echo "common"; then - echo "\$(call inherit-product, vendor/"$VENDOR"/config/common.mk)" >> device/samsung/a20/"$VENDOR"_a20.mk -fi -echo "PRODUCT_NAME := "$VENDOR"_a20" >> device/samsung/a20/"$VENDOR"_a20.mk -echo "" >> device/samsung/a20/"$VENDOR"_a20.mk -echo "# Additional Props" >> device/samsung/a20/"$VENDOR"_a20.mk -echo "TARGET_FACE_UNLOCK_SUPPORTED := true" >> device/samsung/a20/"$VENDOR"_a20.mk -echo "TARGET_BOOT_ANIMATION_RES := 720" >> device/samsung/a20/"$VENDOR"_a20.mk - diff --git a/a20e/setup.sh b/a20e/setup.sh deleted file mode 100755 index 2c17ce1..0000000 --- a/a20e/setup.sh +++ /dev/null @@ -1,22 +0,0 @@ -VENDOR=$(cat device/samsung/universal7885-common/vendor_name) -if [ ! $VENDOR ]; then -VENDOR=aosp; -fi - -# Generate AndroidProducts.mk -echo "# Auto-Generated by device/samsung/a20e/setup.sh" > device/samsung/a20e/AndroidProducts.mk -echo "PRODUCT_MAKEFILES += \$(LOCAL_DIR)/"$VENDOR"_a20e.mk" >> device/samsung/a20e/AndroidProducts.mk - -# Generate _a20e.mk -echo "# Auto-Generated by device/samsung/a20e/setup.sh" > device/samsung/a20e/"$VENDOR"_a20e.mk -echo "\$(call inherit-product, device/samsung/a20e/full_a20e.mk)" >> device/samsung/a20e/"$VENDOR"_a20e.mk -if test -f vendor/"$VENDOR"/config/common_full_phone.mk && echo "common_full_phone"; then - echo "\$(call inherit-product, vendor/"$VENDOR"/config/common_full_phone.mk)" >> device/samsung/a20e/"$VENDOR"_a20e.mk -elif test -f vendor/"$VENDOR"/config/common.mk && echo "common"; then - echo "\$(call inherit-product, vendor/"$VENDOR"/config/common.mk)" >> device/samsung/a20e/"$VENDOR"_a20e.mk -fi -echo "PRODUCT_NAME := "$VENDOR"_a20e" >> device/samsung/a20e/"$VENDOR"_a20e.mk -echo "" >> device/samsung/a20e/"$VENDOR"_a20e.mk -echo "# Additional Props" >> device/samsung/a20e/"$VENDOR"_a20e.mk -echo "TARGET_FACE_UNLOCK_SUPPORTED := true" >> device/samsung/a20e/"$VENDOR"_a20e.mk -echo "TARGET_BOOT_ANIMATION_RES := 720" >> device/samsung/a20e/"$VENDOR"_a20e.mk diff --git a/a30/setup.sh b/a30/setup.sh deleted file mode 100755 index 5076fae..0000000 --- a/a30/setup.sh +++ /dev/null @@ -1,22 +0,0 @@ -VENDOR=$(cat device/samsung/universal7885-common/vendor_name) -if [ ! $VENDOR ]; then -VENDOR=aosp; -fi -# Generate AndroidProducts.mk -echo "# Auto-Generated by device/samsung/a30/setup.sh" > device/samsung/a30/AndroidProducts.mk -echo "PRODUCT_MAKEFILES += \$(LOCAL_DIR)/"$VENDOR"_a30.mk" >> device/samsung/a30/AndroidProducts.mk - -# Generate _a30.mk -echo "# Auto-Generated by device/samsung/a30/setup.sh" > device/samsung/a30/"$VENDOR"_a30.mk -echo "\$(call inherit-product, device/samsung/a30/full_a30.mk)" >> device/samsung/a30/"$VENDOR"_a30.mk -if test -f vendor/"$VENDOR"/config/common_full_phone.mk && echo "common_full_phone"; then - echo "\$(call inherit-product, vendor/"$VENDOR"/config/common_full_phone.mk)" >> device/samsung/a30/"$VENDOR"_a30.mk -elif test -f vendor/"$VENDOR"/config/common.mk && echo "common"; then - echo "\$(call inherit-product, vendor/"$VENDOR"/config/common.mk)" >> device/samsung/a30/"$VENDOR"_a30.mk -fi -echo "PRODUCT_NAME := "$VENDOR"_a30" >> device/samsung/a30/"$VENDOR"_a30.mk -echo "" >> device/samsung/a30/"$VENDOR"_a30.mk -echo "# Additional Props" >> device/samsung/a30/"$VENDOR"_a30.mk -echo "TARGET_FACE_UNLOCK_SUPPORTED := true" >> device/samsung/a30/"$VENDOR"_a30.mk -echo "TARGET_BOOT_ANIMATION_RES := 1080" >> device/samsung/a30/"$VENDOR"_a30.mk - diff --git a/a30s/setup.sh b/a30s/setup.sh deleted file mode 100755 index a8768ff..0000000 --- a/a30s/setup.sh +++ /dev/null @@ -1,22 +0,0 @@ -VENDOR=$(cat device/samsung/universal7885-common/vendor_name) -if [ ! $VENDOR ]; then -VENDOR=aosp; -fi -# Generate AndroidProducts.mk -echo "# Auto-Generated by device/samsung/a30s/setup.sh" > device/samsung/a30s/AndroidProducts.mk -echo "PRODUCT_MAKEFILES += \$(LOCAL_DIR)/"$VENDOR"_a30s.mk" >> device/samsung/a30s/AndroidProducts.mk - -# Generate _a30s.mk -echo "# Auto-Generated by device/samsung/a30s/setup.sh" > device/samsung/a30s/"$VENDOR"_a30s.mk -echo "\$(call inherit-product, device/samsung/a30s/full_a30s.mk)" >> device/samsung/a30s/"$VENDOR"_a30s.mk -if test -f vendor/"$VENDOR"/config/common_full_phone.mk && echo "common_full_phone"; then - echo "\$(call inherit-product, vendor/"$VENDOR"/config/common_full_phone.mk)" >> device/samsung/a30s/"$VENDOR"_a30s.mk -elif test -f vendor/"$VENDOR"/config/common.mk && echo "common"; then - echo "\$(call inherit-product, vendor/"$VENDOR"/config/common.mk)" >> device/samsung/a30s/"$VENDOR"_a30s.mk -fi -echo "PRODUCT_NAME := "$VENDOR"_a30s" >> device/samsung/a30s/"$VENDOR"_a30s.mk -echo "" >> device/samsung/a30s/"$VENDOR"_a30s.mk -echo "# Additional Props" >> device/samsung/a30s/"$VENDOR"_a30s.mk -echo "TARGET_FACE_UNLOCK_SUPPORTED := true" >> device/samsung/a30s/"$VENDOR"_a30s.mk -echo "TARGET_BOOT_ANIMATION_RES := 1080" >> device/samsung/a30s/"$VENDOR"_a30s.mk - diff --git a/a40/setup.sh b/a40/setup.sh deleted file mode 100755 index 605c9f2..0000000 --- a/a40/setup.sh +++ /dev/null @@ -1,22 +0,0 @@ -VENDOR=$(cat device/samsung/universal7885-common/vendor_name) -if [ ! $VENDOR ]; then -VENDOR=aosp; -fi -# Generate AndroidProducts.mk -echo "# Auto-Generated by device/samsung/a40/setup.sh" > device/samsung/a40/AndroidProducts.mk -echo "PRODUCT_MAKEFILES += \$(LOCAL_DIR)/"$VENDOR"_a40.mk" >> device/samsung/a40/AndroidProducts.mk - -# Generate _a40.mk -echo "# Auto-Generated by device/samsung/a40/setup.sh" > device/samsung/a40/"$VENDOR"_a40.mk -echo "\$(call inherit-product, device/samsung/a40/full_a40.mk)" >> device/samsung/a40/"$VENDOR"_a40.mk -if test -f vendor/"$VENDOR"/config/common_full_phone.mk && echo "common_full_phone"; then - echo "\$(call inherit-product, vendor/"$VENDOR"/config/common_full_phone.mk)" >> device/samsung/a40/"$VENDOR"_a40.mk -elif test -f vendor/"$VENDOR"/config/common.mk && echo "common"; then - echo "\$(call inherit-product, vendor/"$VENDOR"/config/common.mk)" >> device/samsung/a40/"$VENDOR"_a40.mk -fi -echo "PRODUCT_NAME := "$VENDOR"_a40" >> device/samsung/a40/"$VENDOR"_a40.mk -echo "" >> device/samsung/a40/"$VENDOR"_a40.mk -echo "# Additional Props" >> device/samsung/a40/"$VENDOR"_a40.mk -echo "TARGET_FACE_UNLOCK_SUPPORTED := true" >> device/samsung/a40/"$VENDOR"_a40.mk -echo "TARGET_BOOT_ANIMATION_RES := 1080" >> device/samsung/a40/"$VENDOR"_a40.mk - diff --git a/universal7885-common/setup.sh b/universal7885-common/setup.sh new file mode 100755 index 0000000..c2c3f1e --- /dev/null +++ b/universal7885-common/setup.sh @@ -0,0 +1,35 @@ +DEVICE=$1 +BASE="device/samsung" +UNI="${BASE}/universal7885-common" +DEV="${BASE}/${DEVICE}" +if [ -z "$DEVICE" ]; then + echo "Something went wrong while generating makefiles!" + exit 1 +fi +VENDOR=$(cat ${UNI}/vendor_name) +if [ ! $VENDOR ]; then + VENDOR=aosp +fi +# Generate AndroidProducts.mk +echo "# Auto-Generated by ${DEV}/setup.sh" >${DEV}/AndroidProducts.mk +echo "PRODUCT_MAKEFILES += \$(LOCAL_DIR)/"$VENDOR"_${DEVICE}.mk" >>${DEV}/AndroidProducts.mk + +# Generate _${DEVICE}.mk +echo "# Auto-Generated by ${DEV}/setup.sh" >${DEV}/"$VENDOR"_${DEVICE}.mk +echo "\$(call inherit-product, ${DEV}/full_${DEVICE}.mk)" >>${DEV}/"$VENDOR"_${DEVICE}.mk +if test -f vendor/"$VENDOR"/config/common_full_phone.mk && echo "common_full_phone"; then + echo "\$(call inherit-product, vendor/"$VENDOR"/config/common_full_phone.mk)" >>${DEV}/"$VENDOR"_${DEVICE}.mk +elif test -f vendor/"$VENDOR"/config/common.mk && echo "common"; then + echo "\$(call inherit-product, vendor/"$VENDOR"/config/common.mk)" >>${DEV}/"$VENDOR"_${DEVICE}.mk +fi +echo "PRODUCT_NAME := "$VENDOR"_${DEVICE}" >>${DEV}/"$VENDOR"_${DEVICE}.mk +echo "" >>${DEV}/"$VENDOR"_${DEVICE}.mk +echo "# Additional Props" >>${DEV}/"$VENDOR"_${DEVICE}.mk +echo "TARGET_FACE_UNLOCK_SUPPORTED := true" >>${DEV}/"$VENDOR"_${DEVICE}.mk + +HD_DEV="a10dd a10 a20 a20e" +if echo $HD_DEV | grep $DEVICE 2>&1 >/dev/null; then + echo "TARGET_BOOT_ANIMATION_RES := 720" >>${DEV}/"$VENDOR"_${DEVICE}.mk +else + echo "TARGET_BOOT_ANIMATION_RES := 1080" >>${DEV}/"$VENDOR"_${DEVICE}.mk +fi diff --git a/universal7885-common/vendorsetup.sh b/universal7885-common/vendorsetup.sh old mode 100644 new mode 100755 index cbb1807..153e238 --- a/universal7885-common/vendorsetup.sh +++ b/universal7885-common/vendorsetup.sh @@ -1,10 +1,11 @@ +UNIVERSAL="device/samsung/universal7885-common" FM_PATH="packages/apps/FMRadio" if [ -e ~/.git-credentials ]; then -MODE="https://" -SPERATOR="/" + MODE="https://" + SPERATOR="/" else -MODE="git@" -SPERATOR=":" + MODE="git@" + SPERATOR=":" fi git clone --depth=1 "$MODE"github.com"$SPERATOR"eurekadevelopment/Eureka-Kernel-Exynos7885-Q-R-S-private.git -b R10.1_rom kernel/samsung/exynos7885 git clone https://github.com/lineageos/android_hardware_samsung_slsi_libbt hardware/samsung_slsi/libbt @@ -14,32 +15,22 @@ mv hardware/samsung/nfc . git clone https://github.com/eurekadevelopment/android_hardware_samsung hardware/samsung mv nfc hardware/samsung git clone --depth=1 https://github.com/eurekadevelopment/android_vendor_samsung_exynos7885.git -b master vendor/samsung -if test -f device/samsung/universal7885-common/vendor_name; then -rm device/samsung/universal7885-common/vendor_name +if test -f ${UNIVERSAL}/vendor_name; then + rm ${UNIVERSAL}/vendor_name fi -python3 device/samsung/universal7885-common/vendor_detect/main.py -echo "Generating A10 Makefiles" -./device/samsung/a10/setup.sh -echo "Generating A10 ARM Makefiles" -./device/samsung/a10dd/setup.sh -echo "Generating A20 Makefiles" -./device/samsung/a20/setup.sh -echo "Generating A20e Makefiles" -./device/samsung/a20e/setup.sh -echo "Generating A30 Makefiles" -./device/samsung/a30/setup.sh -echo "Generating A30s Makefiles" -./device/samsung/a30s/setup.sh -echo "Generating A40 Makefiles" -./device/samsung/a40/setup.sh +python3 ${UNIVERSAL}/vendor_detect/main.py +for dev in a10dd a10 a20 a20e a30 a30s a40; do + echo "Generating ${dev} Makefiles..." + bash ${UNIVERSAL}/setup.sh "$dev" +done # For FM Radio if grep -q isAudioServerUid\(callingUid\) frameworks/av/services/audioflinger/AudioFlinger.cpp; then -echo "Applying FM routing patch" -sed -i 's/isAudioServerUid(callingUid)/isAudioServerOrSystemServerUid(callingUid)/g' frameworks/av/services/audioflinger/AudioFlinger.cpp + echo "Applying FM routing patch" + sed -i 's/isAudioServerUid(callingUid)/isAudioServerOrSystemServerUid(callingUid)/g' frameworks/av/services/audioflinger/AudioFlinger.cpp fi # Remove multiple declared FMRadio path (we have our own FMRadio and this cause build error) -if [ -d "$FM_PATH" ]; then -echo "Remove FMRadio from ROM Source" -rm -Rf $FM_PATH; +if [ -d "$FM_PATH" ]; then + echo "Remove FMRadio from ROM Source" + rm -Rf $FM_PATH fi