Skip to content

Commit d11e502

Browse files
committed
vendor/aokp - another cleaup
Change-Id: Iada73ca57bddb3254681c46ac60743197c2406af Signed-off-by: STELIX <ssspinni@gmail.com>
1 parent 78fc57c commit d11e502

File tree

9 files changed

+39
-30
lines changed

9 files changed

+39
-30
lines changed

build/core/apicheck_msg_current.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ You have tried to change the API from what has been previously approved.
44

55
STOP.
66
Read this:
7-
https://github.com/LineageOS/android_lineage-sdk/wiki/Creating-an-API-for-the-SDK#updating--verifying-the-api
7+
https://github.com/AOKP/lineage-sdk/wiki/Creating-an-API-for-the-SDK#updating--verifying-the-api
88

99
To make these errors go away, you have two choices:
1010
1) You can add "@hide" javadoc comments to the methods, etc. listed in the

configs/common.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,6 @@ PRODUCT_PACKAGES += \
164164
BluetoothExt \
165165
CellBroadcastReceiver \
166166
Development \
167-
LatinIME \
168-
LatinImeDictionaryPack \
169167
masquerade \
170168
mGerrit \
171169
Microbes \

configs/common_full.mk

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,8 @@
11
# Inherit common AOKP stuff
22
$(call inherit-product, vendor/aokp/configs/common.mk)
33

4-
# Bring in all video files
5-
$(call inherit-product, frameworks/base/data/videos/VideoPackage2.mk)
6-
74
PRODUCT_SIZE := full
85

9-
# Include AOKP LatinIME dictionaries
10-
PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/dictionaries
11-
12-
PRODUCT_PACKAGES += \
13-
VideoEditor \
14-
libvideoeditor_jni \
15-
libvideoeditor_core \
16-
libvideoeditor_osal \
17-
libvideoeditor_videofilters \
18-
libvideoeditorplayer
19-
206
# Recorder
217
PRODUCT_PACKAGES += \
228
Recorder

configs/common_full_phone.mk

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
# Inherit common AOKP stuff
22
$(call inherit-product, vendor/aokp/configs/common_full.mk)
3+
4+
# Required packages
5+
PRODUCT_PACKAGES += \
6+
LatinIME
7+
8+
# Include Lineage LatinIME dictionaries
9+
PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/dictionaries
10+
311
$(call inherit-product, vendor/aokp/configs/telephony.mk)
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
11
# Inherit common AOKP stuff
22
$(call inherit-product, vendor/aokp/configs/common_full.mk)
3+
4+
# Required packages
5+
PRODUCT_PACKAGES += \
6+
LatinIME
7+
8+
# Include Lineage LatinIME dictionaries
9+
PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/dictionaries

configs/common_mini_phone.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
$(call inherit-product, vendor/aokp/configs/common_mini.mk)
22

3+
# Required packages
4+
PRODUCT_PACKAGES += \
5+
LatinIME
6+
37
$(call inherit-product, vendor/aokp/configs/telephony.mk)
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
# Inherit common AOKP stuff
22
$(call inherit-product, vendor/aokp/configs/common_mini.mk)
3+
4+
# Required packages
5+
PRODUCT_PACKAGES += \
6+
LatinIME

prebuilt/common/bin/backuptool.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@ check_prereq() {
3434
if [ ! -r /system/build.prop ]; then
3535
return 0
3636
fi
37-
<<<<<<< HEAD
38-
if ( ! grep -q "^ro.aokp.branch=$V.*" /system/build.prop ); then
39-
=======
40-
if ( ! grep -q "^ro.lineage.version=$V.*" /system/build.prop ); then
41-
>>>>>>> 5c60e4f... lineage: Complete the rebrand
37+
if ( ! grep -q "^ro.aokp.version=$V.*" /system/build.prop ); then
4238
echo "Not backing up files from incompatible version: $V"
4339
return 0
4440
fi

prebuilt/common/etc/init.d/00banner

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,18 @@
22
#
33
# Print startup info
44
#
5-
L="log -p i -t lineage"
5+
L="log -p i -t AOKP"
66

7-
$L "_ _ "
8-
$L "| (_)_ __ ___ __ _ __ _ ___ ___ ___ "
9-
$L "| | | '_ \\ / _ \\/ _\` |/ _\` |/ _ \\/ _ \\/ __|"
10-
$L "| | | | | | __/ (_| | (_| | __/ (_) \\__ \\"
11-
$L "|_|_|_| |_|\\___|\\__,_|\\__, |\\___|\\___/|___/"
12-
$L " |___/"
13-
$L "Welcome to Android `getprop ro.build.version.release` / LineageOS-`getprop ro.lineage.version`";
7+
$L "******************************************"
8+
$L "* ______ _____ __ __ _____ *"
9+
$L "* /\\ _ \\/\\ __`\\/\\ \\/\\ \\ /\\ _ `\\ *"
10+
$L "* \\ \\ \\L\\ \\ \\ \\/\\ \\ \\ \\/'/'\\ \\ \\L\\ \\ *"
11+
$L "* \\ \\ __ \\ \\ \\ \\ \\ \\ , < \\ \\ ,__/ *"
12+
$L "* \\ \\ \\/\\ \\ \\ \\_\\ \\ \\ \\\\\\`\\ \\ \\ \\/ *"
13+
$L "* \\ \\_\\ \\_\\ \\_____\\ \\_\\ \\_\\\\\\ \\_\\ *"
14+
$L "* \\/_/\\/_/\\/_____/\\/_/\\/_/ \\/_/ *"
15+
$L "* *"
16+
$L "* http://aokp.co *"
17+
$L "******************************************"
18+
$L "A wise man never plays leapfrog with a unicorn"
19+
$L "`getprop ro.build.version.release` / AOKP-`getprop ro.aokp.version`";

0 commit comments

Comments
 (0)