From d11e5026bf6c839481e875e8cb4af41683f80540 Mon Sep 17 00:00:00 2001 From: STELIX Date: Tue, 12 Dec 2017 12:30:19 +0100 Subject: [PATCH] vendor/aokp - another cleaup Change-Id: Iada73ca57bddb3254681c46ac60743197c2406af Signed-off-by: STELIX --- build/core/apicheck_msg_current.txt | 2 +- configs/common.mk | 2 -- configs/common_full.mk | 14 -------------- configs/common_full_phone.mk | 8 ++++++++ configs/common_full_tablet_wifionly.mk | 7 +++++++ configs/common_mini_phone.mk | 4 ++++ configs/common_mini_tablet_wifionly.mk | 4 ++++ prebuilt/common/bin/backuptool.sh | 6 +----- prebuilt/common/etc/init.d/00banner | 22 ++++++++++++++-------- 9 files changed, 39 insertions(+), 30 deletions(-) diff --git a/build/core/apicheck_msg_current.txt b/build/core/apicheck_msg_current.txt index 568d08520f..1b7067d073 100644 --- a/build/core/apicheck_msg_current.txt +++ b/build/core/apicheck_msg_current.txt @@ -4,7 +4,7 @@ You have tried to change the API from what has been previously approved. STOP. Read this: - https://github.com/LineageOS/android_lineage-sdk/wiki/Creating-an-API-for-the-SDK#updating--verifying-the-api + https://github.com/AOKP/lineage-sdk/wiki/Creating-an-API-for-the-SDK#updating--verifying-the-api To make these errors go away, you have two choices: 1) You can add "@hide" javadoc comments to the methods, etc. listed in the diff --git a/configs/common.mk b/configs/common.mk index bf24fdd248..c4e1adc024 100644 --- a/configs/common.mk +++ b/configs/common.mk @@ -164,8 +164,6 @@ PRODUCT_PACKAGES += \ BluetoothExt \ CellBroadcastReceiver \ Development \ - LatinIME \ - LatinImeDictionaryPack \ masquerade \ mGerrit \ Microbes \ diff --git a/configs/common_full.mk b/configs/common_full.mk index 843a6c4266..f37083286c 100644 --- a/configs/common_full.mk +++ b/configs/common_full.mk @@ -1,22 +1,8 @@ # Inherit common AOKP stuff $(call inherit-product, vendor/aokp/configs/common.mk) -# Bring in all video files -$(call inherit-product, frameworks/base/data/videos/VideoPackage2.mk) - PRODUCT_SIZE := full -# Include AOKP LatinIME dictionaries -PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/dictionaries - -PRODUCT_PACKAGES += \ - VideoEditor \ - libvideoeditor_jni \ - libvideoeditor_core \ - libvideoeditor_osal \ - libvideoeditor_videofilters \ - libvideoeditorplayer - # Recorder PRODUCT_PACKAGES += \ Recorder diff --git a/configs/common_full_phone.mk b/configs/common_full_phone.mk index d8dac47abc..7fbad90881 100644 --- a/configs/common_full_phone.mk +++ b/configs/common_full_phone.mk @@ -1,3 +1,11 @@ # Inherit common AOKP stuff $(call inherit-product, vendor/aokp/configs/common_full.mk) + +# Required packages +PRODUCT_PACKAGES += \ + LatinIME + +# Include Lineage LatinIME dictionaries +PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/dictionaries + $(call inherit-product, vendor/aokp/configs/telephony.mk) \ No newline at end of file diff --git a/configs/common_full_tablet_wifionly.mk b/configs/common_full_tablet_wifionly.mk index 4d6b67a09e..bc8d5a58e5 100644 --- a/configs/common_full_tablet_wifionly.mk +++ b/configs/common_full_tablet_wifionly.mk @@ -1,2 +1,9 @@ # Inherit common AOKP stuff $(call inherit-product, vendor/aokp/configs/common_full.mk) + +# Required packages +PRODUCT_PACKAGES += \ + LatinIME + +# Include Lineage LatinIME dictionaries +PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/dictionaries \ No newline at end of file diff --git a/configs/common_mini_phone.mk b/configs/common_mini_phone.mk index 2e011c6c9e..ff588f2a58 100644 --- a/configs/common_mini_phone.mk +++ b/configs/common_mini_phone.mk @@ -1,3 +1,7 @@ $(call inherit-product, vendor/aokp/configs/common_mini.mk) +# Required packages +PRODUCT_PACKAGES += \ + LatinIME + $(call inherit-product, vendor/aokp/configs/telephony.mk) \ No newline at end of file diff --git a/configs/common_mini_tablet_wifionly.mk b/configs/common_mini_tablet_wifionly.mk index 6aceb005e2..8760e44bf0 100644 --- a/configs/common_mini_tablet_wifionly.mk +++ b/configs/common_mini_tablet_wifionly.mk @@ -1,2 +1,6 @@ # Inherit common AOKP stuff $(call inherit-product, vendor/aokp/configs/common_mini.mk) + +# Required packages +PRODUCT_PACKAGES += \ + LatinIME diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh index 9aa8010722..a5a8febaa4 100644 --- a/prebuilt/common/bin/backuptool.sh +++ b/prebuilt/common/bin/backuptool.sh @@ -34,11 +34,7 @@ check_prereq() { if [ ! -r /system/build.prop ]; then return 0 fi -<<<<<<< HEAD -if ( ! grep -q "^ro.aokp.branch=$V.*" /system/build.prop ); then -======= -if ( ! grep -q "^ro.lineage.version=$V.*" /system/build.prop ); then ->>>>>>> 5c60e4f... lineage: Complete the rebrand +if ( ! grep -q "^ro.aokp.version=$V.*" /system/build.prop ); then echo "Not backing up files from incompatible version: $V" return 0 fi diff --git a/prebuilt/common/etc/init.d/00banner b/prebuilt/common/etc/init.d/00banner index da6d487f92..d80be0dc67 100644 --- a/prebuilt/common/etc/init.d/00banner +++ b/prebuilt/common/etc/init.d/00banner @@ -2,12 +2,18 @@ # # Print startup info # -L="log -p i -t lineage" +L="log -p i -t AOKP" -$L "_ _ " -$L "| (_)_ __ ___ __ _ __ _ ___ ___ ___ " -$L "| | | '_ \\ / _ \\/ _\` |/ _\` |/ _ \\/ _ \\/ __|" -$L "| | | | | | __/ (_| | (_| | __/ (_) \\__ \\" -$L "|_|_|_| |_|\\___|\\__,_|\\__, |\\___|\\___/|___/" -$L " |___/" -$L "Welcome to Android `getprop ro.build.version.release` / LineageOS-`getprop ro.lineage.version`"; +$L "******************************************" +$L "* ______ _____ __ __ _____ *" +$L "* /\\ _ \\/\\ __`\\/\\ \\/\\ \\ /\\ _ `\\ *" +$L "* \\ \\ \\L\\ \\ \\ \\/\\ \\ \\ \\/'/'\\ \\ \\L\\ \\ *" +$L "* \\ \\ __ \\ \\ \\ \\ \\ \\ , < \\ \\ ,__/ *" +$L "* \\ \\ \\/\\ \\ \\ \\_\\ \\ \\ \\\\\\`\\ \\ \\ \\/ *" +$L "* \\ \\_\\ \\_\\ \\_____\\ \\_\\ \\_\\\\\\ \\_\\ *" +$L "* \\/_/\\/_/\\/_____/\\/_/\\/_/ \\/_/ *" +$L "* *" +$L "* http://aokp.co *" +$L "******************************************" +$L "A wise man never plays leapfrog with a unicorn" +$L "`getprop ro.build.version.release` / AOKP-`getprop ro.aokp.version`";