Skip to content

Commit 062f820

Browse files
gmillzgmillz
committed
Initial AOSPB bringup
1 parent 7a301d6 commit 062f820

17 files changed

+81
-109
lines changed

‎build/envsetup.sh

+28-28
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# slim functions that extend build/envsetup.sh
1+
# aospb functions that extend build/envsetup.sh
22

3-
function slim_device_combos()
3+
function aospb_device_combos()
44
{
55
local T list_file variant device
66

77
T="$(gettop)"
8-
list_file="${T}/vendor/slim/slim.devices"
8+
list_file="${T}/vendor/aospb/aospb.devices"
99
variant="userdebug"
1010

1111
if [[ $1 ]]
@@ -27,45 +27,45 @@ function slim_device_combos()
2727
if [[ ! -f "${list_file}" ]]
2828
then
2929
echo "unable to find device list: ${list_file}"
30-
list_file="${T}/vendor/slim/slim.devices"
30+
list_file="${T}/vendor/aospb/aospb.devices"
3131
echo "defaulting device list file to: ${list_file}"
3232
fi
3333

3434
while IFS= read -r device
3535
do
36-
add_lunch_combo "slim_${device}-${variant}"
36+
add_lunch_combo "aospb_${device}-${variant}"
3737
done < "${list_file}"
3838
}
3939

40-
function slim_rename_function()
40+
function aospb_rename_function()
4141
{
42-
eval "original_slim_$(declare -f ${1})"
42+
eval "original_aospb_$(declare -f ${1})"
4343
}
4444

45-
function _slim_build_hmm() #hidden
45+
function _aospb_build_hmm() #hidden
4646
{
4747
printf "%-8s %s" "${1}:" "${2}"
4848
}
4949

50-
function slim_append_hmm()
50+
function aospb_append_hmm()
5151
{
52-
HMM_DESCRIPTIVE=("${HMM_DESCRIPTIVE[@]}" "$(_slim_build_hmm "$1" "$2")")
52+
HMM_DESCRIPTIVE=("${HMM_DESCRIPTIVE[@]}" "$(_aospb_build_hmm "$1" "$2")")
5353
}
5454

55-
function slim_add_hmm_entry()
55+
function aospb_add_hmm_entry()
5656
{
5757
for c in ${!HMM_DESCRIPTIVE[*]}
5858
do
5959
if [[ "${1}" == $(echo "${HMM_DESCRIPTIVE[$c]}" | cut -f1 -d":") ]]
6060
then
61-
HMM_DESCRIPTIVE[${c}]="$(_slim_build_hmm "$1" "$2")"
61+
HMM_DESCRIPTIVE[${c}]="$(_aospb_build_hmm "$1" "$2")"
6262
return
6363
fi
6464
done
65-
slim_append_hmm "$1" "$2"
65+
aospb_append_hmm "$1" "$2"
6666
}
6767

68-
function slimremote()
68+
function aospbremote()
6969
{
7070
local proj pfx project
7171

@@ -74,7 +74,7 @@ function slimremote()
7474
echo "Not in a git directory. Please run this from an Android repository you wish to set up."
7575
return
7676
fi
77-
git remote rm slim 2> /dev/null
77+
git remote rm aospb 2> /dev/null
7878

7979
proj="$(pwd -P | sed "s#$ANDROID_BUILD_TOP/##g")"
8080

@@ -84,8 +84,8 @@ function slimremote()
8484

8585
project="${proj//\//_}"
8686

87-
git remote add slim "[email protected]:SlimRoms/$pfx$project"
88-
echo "Remote 'slim' created"
87+
git remote add aospb "[email protected]:AOSPB/$pfx$project"
88+
echo "Remote 'aospb' created"
8989
}
9090

9191
function cmremote()
@@ -145,11 +145,11 @@ function cafremote()
145145
echo "Remote 'caf' created"
146146
}
147147

148-
function slim_push()
148+
function aospb_push()
149149
{
150150
local branch ssh_name path_opt proj
151151
branch="lp5.1"
152-
ssh_name="slim_review"
152+
ssh_name="aospb_review"
153153
path_opt=
154154

155155
if [[ "$1" ]]
@@ -167,25 +167,25 @@ function slim_push()
167167
proj="android_$proj"
168168
fi
169169

170-
git $path_opt push "ssh://${ssh_name}/SlimRoms/$proj" "HEAD:refs/for/$branch"
170+
git $path_opt push "ssh://${ssh_name}/AOSPB/$proj" "HEAD:refs/for/$branch"
171171
}
172172

173173

174-
slim_rename_function hmm
174+
aospb_rename_function hmm
175175
function hmm() #hidden
176176
{
177177
local i T
178178
T="$(gettop)"
179-
original_slim_hmm
179+
original_aospb_hmm
180180
echo
181181

182-
echo "vendor/slim extended functions. The complete list is:"
183-
for i in $(grep -P '^function .*$' "$T/vendor/slim/build/envsetup.sh" | grep -v "#hidden" | sed 's/function \([a-z_]*\).*/\1/' | sort | uniq); do
182+
echo "vendor/aospb extended functions. The complete list is:"
183+
for i in $(grep -P '^function .*$' "$T/vendor/aospb/build/envsetup.sh" | grep -v "#hidden" | sed 's/function \([a-z_]*\).*/\1/' | sort | uniq); do
184184
echo "$i"
185185
done |column
186186
}
187187

188-
slim_append_hmm "slimremote" "Add a git remote for matching SLIM repository"
189-
slim_append_hmm "cmremote" "Add a git remote for matching CM repository"
190-
slim_append_hmm "aospremote" "Add git remote for matching AOSP repository"
191-
slim_append_hmm "cafremote" "Add git remote for matching CodeAurora repository."
188+
aospb_append_hmm "aospbremote" "Add a git remote for matching AOSPB repository"
189+
aospb_append_hmm "cmremote" "Add a git remote for matching CM repository"
190+
aospb_append_hmm "aospremote" "Add git remote for matching AOSP repository"
191+
aospb_append_hmm "cafremote" "Add git remote for matching CodeAurora repository."

‎config/cdma.mk

-3
This file was deleted.

‎config/common.mk

+34-55
Original file line numberDiff line numberDiff line change
@@ -26,39 +26,39 @@ PRODUCT_PROPERTY_OVERRIDES += \
2626

2727
# Backup Tool
2828
PRODUCT_COPY_FILES += \
29-
vendor/slim/prebuilt/common/bin/backuptool.sh:install/bin/backuptool.sh \
30-
vendor/slim/prebuilt/common/bin/backuptool.functions:install/bin/backuptool.functions \
31-
vendor/slim/prebuilt/common/bin/50-slim.sh:system/addon.d/50-slim.sh
29+
vendor/aospb/prebuilt/common/bin/backuptool.sh:install/bin/backuptool.sh \
30+
vendor/aospb/prebuilt/common/bin/backuptool.functions:install/bin/backuptool.functions \
31+
vendor/aospb/prebuilt/common/bin/50-aospb.sh:system/addon.d/50-aospb.sh
3232

3333
# Signature compatibility validation
3434
PRODUCT_COPY_FILES += \
35-
vendor/slim/prebuilt/common/bin/otasigcheck.sh:install/bin/otasigcheck.sh
35+
vendor/aospb/prebuilt/common/bin/otasigcheck.sh:install/bin/otasigcheck.sh
3636

37-
# SLIM-specific init file
37+
# AOSPB-specific init file
3838
PRODUCT_COPY_FILES += \
39-
vendor/slim/prebuilt/common/etc/init.local.rc:root/init.slim.rc
39+
vendor/aospb/prebuilt/common/etc/init.local.rc:root/init.aospb.rc
4040

4141
# Copy latinime for gesture typing
4242
PRODUCT_COPY_FILES += \
43-
vendor/slim/prebuilt/common/lib/libjni_latinimegoogle.so:system/lib/libjni_latinimegoogle.so
43+
vendor/aospb/prebuilt/common/lib/libjni_latinimegoogle.so:system/lib/libjni_latinimegoogle.so
4444

4545
# SELinux filesystem labels
4646
PRODUCT_COPY_FILES += \
47-
vendor/slim/prebuilt/common/etc/init.d/50selinuxrelabel:system/etc/init.d/50selinuxrelabel
47+
vendor/aospb/prebuilt/common/etc/init.d/50selinuxrelabel:system/etc/init.d/50selinuxrelabel
4848

4949
# Enable SIP+VoIP on all targets
5050
PRODUCT_COPY_FILES += \
5151
frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml
5252

5353
# Don't export PS1 in /system/etc/mkshrc.
5454
PRODUCT_COPY_FILES += \
55-
vendor/slim/prebuilt/common/etc/mkshrc:system/etc/mkshrc \
56-
vendor/slim/prebuilt/common/etc/sysctl.conf:system/etc/sysctl.conf
55+
vendor/aospb/prebuilt/common/etc/mkshrc:system/etc/mkshrc \
56+
vendor/aospb/prebuilt/common/etc/sysctl.conf:system/etc/sysctl.conf
5757

5858
PRODUCT_COPY_FILES += \
59-
vendor/slim/prebuilt/common/etc/init.d/00banner:system/etc/init.d/00banner \
60-
vendor/slim/prebuilt/common/etc/init.d/90userinit:system/etc/init.d/90userinit \
61-
vendor/slim/prebuilt/common/bin/sysinit:system/bin/sysinit
59+
vendor/aospb/prebuilt/common/etc/init.d/00banner:system/etc/init.d/00banner \
60+
vendor/aospb/prebuilt/common/etc/init.d/90userinit:system/etc/init.d/90userinit \
61+
vendor/aospb/prebuilt/common/bin/sysinit:system/bin/sysinit
6262

6363
# Required packages
6464
PRODUCT_PACKAGES += \
@@ -77,19 +77,10 @@ PRODUCT_PACKAGES += \
7777
PRODUCT_PACKAGES += \
7878
AudioFX
7979

80-
# CM Hardware Abstraction Framework
81-
PRODUCT_PACKAGES += \
82-
org.cyanogenmod.hardware \
83-
org.cyanogenmod.hardware.xml
84-
8580
# Extra Optional packages
8681
PRODUCT_PACKAGES += \
87-
SlimLauncher \
8882
LatinIME \
89-
BluetoothExt \
90-
DashClock
91-
92-
# SlimFileManager removed until updated
83+
BluetoothExt
9384

9485
# Extra tools
9586
PRODUCT_PACKAGES += \
@@ -116,7 +107,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
116107
# easy way to extend to add more packages
117108
-include vendor/extra/product.mk
118109

119-
PRODUCT_PACKAGE_OVERLAYS += vendor/slim/overlay/common
110+
PRODUCT_PACKAGE_OVERLAYS += vendor/aospb/overlay/common
120111

121112
# Boot animation include
122113
ifneq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
@@ -130,7 +121,7 @@ TARGET_BOOTANIMATION_SIZE := $(shell \
130121
fi )
131122

132123
# get a sorted list of the sizes
133-
bootanimation_sizes := $(subst .zip,, $(shell ls vendor/slim/prebuilt/common/bootanimation))
124+
bootanimation_sizes := $(subst .zip,, $(shell ls vendor/aospb/prebuilt/common/bootanimation))
134125
bootanimation_sizes := $(shell echo -e $(subst $(space),'\n',$(bootanimation_sizes)) | sort -rn)
135126

136127
# find the appropriate size and set
@@ -148,56 +139,44 @@ $(foreach size,$(bootanimation_sizes), $(call check_and_set_bootanimation,$(size
148139

149140
ifeq ($(TARGET_BOOTANIMATION_HALF_RES),true)
150141
PRODUCT_COPY_FILES += \
151-
vendor/slim/prebuilt/common/bootanimation/halfres/$(TARGET_BOOTANIMATION_NAME).zip:system/media/bootanimation.zip
142+
vendor/aospb/prebuilt/common/bootanimation/halfres/$(TARGET_BOOTANIMATION_NAME).zip:system/media/bootanimation.zip
152143
else
153144
PRODUCT_COPY_FILES += \
154-
vendor/slim/prebuilt/common/bootanimation/$(TARGET_BOOTANIMATION_NAME).zip:system/media/bootanimation.zip
145+
vendor/aospb/prebuilt/common/bootanimation/$(TARGET_BOOTANIMATION_NAME).zip:system/media/bootanimation.zip
155146
endif
156147
endif
157148

158149
# Versioning System
159-
# SlimLP first version.
160-
PRODUCT_VERSION_MAJOR = 6.0
150+
PRODUCT_VERSION_MAJOR = 6.0.1
161151
PRODUCT_VERSION_MINOR = alpha
162152
PRODUCT_VERSION_MAINTENANCE = 0.1
163-
ifdef SLIM_BUILD_EXTRA
164-
SLIM_POSTFIX := -$(SLIM_BUILD_EXTRA)
153+
ifdef AOSPB_BUILD_EXTRA
154+
AOSPB_POSTFIX := -$(AOSPB_BUILD_EXTRA)
165155
endif
166-
ifndef SLIM_BUILD_TYPE
167-
SLIM_BUILD_TYPE := UNOFFICIAL
156+
ifndef AOSPB_BUILD_TYPE
157+
AOSPB_BUILD_TYPE := UNOFFICIAL
168158
PLATFORM_VERSION_CODENAME := UNOFFICIAL
169159
endif
170160

171-
ifeq ($(SLIM_BUILD_TYPE),DM)
172-
SLIM_POSTFIX := -$(shell date +"%Y%m%d")
161+
ifeq ($(AOSPB_BUILD_TYPE),DM)
162+
AOSPB_POSTFIX := -$(shell date +"%Y%m%d")
173163
endif
174164

175-
ifndef SLIM_POSTFIX
176-
SLIM_POSTFIX := -$(shell date +"%Y%m%d-%H%M")
165+
ifndef AOSPB_POSTFIX
166+
AOSPB_POSTFIX := -$(shell date +"%Y%m%d-%H%M")
177167
endif
178168

179-
PLATFORM_VERSION_CODENAME := $(SLIM_BUILD_TYPE)
180-
181-
# SlimIRC
182-
# export INCLUDE_SLIMIRC=1 for unofficial builds
183-
ifneq ($(filter WEEKLY OFFICIAL,$(SLIM_BUILD_TYPE)),)
184-
INCLUDE_SLIMIRC = 1
185-
endif
186-
187-
ifneq ($(INCLUDE_SLIMIRC),)
188-
PRODUCT_PACKAGES += SlimIRC
189-
endif
169+
PLATFORM_VERSION_CODENAME := $(AOSPB_BUILD_TYPE)
190170

191171
# Set all versions
192-
SLIM_VERSION := Slim-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-$(SLIM_BUILD_TYPE)$(SLIM_POSTFIX)
193-
SLIM_MOD_VERSION := Slim-$(SLIM_BUILD)-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-$(SLIM_BUILD_TYPE)$(SLIM_POSTFIX)
172+
AOSPB_VERSION := AOSPB-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-$(AOSPB_BUILD_TYPE)$(AOSPB_POSTFIX)
173+
AOSPB_MOD_VERSION := AOSPB-$(AOSPB_BUILD)-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-$(AOSPB_BUILD_TYPE)$(AOSPB_POSTFIX)
194174

195175
PRODUCT_PROPERTY_OVERRIDES += \
196176
BUILD_DISPLAY_ID=$(BUILD_ID) \
197-
slim.ota.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE) \
198-
ro.slim.version=$(SLIM_VERSION) \
199-
ro.modversion=$(SLIM_MOD_VERSION) \
200-
ro.slim.buildtype=$(SLIM_BUILD_TYPE)
177+
ro.aospb.version=$(AOSPB_VERSION) \
178+
ro.modversion=$(AOSPB_MOD_VERSION) \
179+
ro.aospb.buildtype=$(AOSPB_BUILD_TYPE)
201180

202-
EXTENDED_POST_PROCESS_PROPS := vendor/slim/tools/slim_process_props.py
181+
EXTENDED_POST_PROCESS_PROPS := vendor/aospb/tools/process_props.py
203182

‎config/common_apn.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# World APN list
22
PRODUCT_COPY_FILES += \
3-
vendor/slim/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
3+
vendor/aospb/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
44

55
# Selective SPN list for operator number who has the problem.
66
PRODUCT_COPY_FILES += \
7-
vendor/slim/prebuilt/common/etc/selective-spn-conf.xml:system/etc/selective-spn-conf.xml
7+
vendor/aospb/prebuilt/common/etc/selective-spn-conf.xml:system/etc/selective-spn-conf.xml
88

‎config/common_full_hybrid_wifionly.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Inherit common stuff
2-
$(call inherit-product, vendor/slim/config/common.mk)
2+
$(call inherit-product, vendor/aospb/config/common.mk)
33

4-
PRODUCT_PACKAGE_OVERLAYS += vendor/slim/overlay/tablet
4+
PRODUCT_PACKAGE_OVERLAYS += vendor/aospb/overlay/tablet
55

66
# BT config
77
PRODUCT_COPY_FILES += \

‎config/common_full_phone.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Inherit common stuff
2-
$(call inherit-product, vendor/slim/config/common.mk)
3-
$(call inherit-product, vendor/slim/config/common_apn.mk)
2+
$(call inherit-product, vendor/aospb/config/common.mk)
3+
$(call inherit-product, vendor/aospb/config/common_apn.mk)
44

55
# SIM Toolkit
66
PRODUCT_PACKAGES += \

‎config/common_full_tablet_lte.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Inherit common stuff
2-
$(call inherit-product, vendor/slim/config/common.mk)
3-
$(call inherit-product, vendor/slim/config/common_apn.mk)
2+
$(call inherit-product, vendor/aospb/config/common.mk)
3+
$(call inherit-product, vendor/aospb/config/common_apn.mk)

‎config/common_full_tablet_wifionly.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Inherit common stuff
2-
$(call inherit-product, vendor/slim/config/common.mk)
2+
$(call inherit-product, vendor/aospb/config/common.mk)

‎config/gsm.mk

-3
This file was deleted.

‎config/nfc_enhanced.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# This device supports CM enhanced NFC
22
PRODUCT_COPY_FILES += \
3-
vendor/slim/config/permissions/com.cyanogenmod.nfc.enhanced.xml:system/etc/permissions/com.cyanogenmod.nfc.enhanced.xml
3+
vendor/aospb/config/permissions/com.cyanogenmod.nfc.enhanced.xml:system/etc/permissions/com.cyanogenmod.nfc.enhanced.xml

‎prebuilt/common/bin/50-slim.sh ‎prebuilt/common/bin/50-aospb.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/sbin/sh
22
#
3-
# /system/addon.d/50-slim.sh
3+
# /system/addon.d/50-aospb.sh
44
# During a Slim upgrade, this script backs up /system/etc/hosts,
55
# /system is formatted and reinstalled, then the file is restored.
66
#

‎prebuilt/common/bin/backuptool.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
export C=/tmp/backupdir
77
export S=/system
8-
export V=Slim-5.1
8+
export V=AOSPB
99

1010
# Scripts in /system/addon.d expect to find backuptool.functions in /tmp
1111
cp -f /tmp/install/bin/backuptool.functions /tmp
@@ -25,7 +25,7 @@ restore_addon_d() {
2525

2626
# Proceed only if /system is the expected major and minor version
2727
check_prereq() {
28-
if ( ! grep -q "^ro.slim.version=$V.*" /system/build.prop ); then
28+
if ( ! grep -q "^ro.aospb.version=$V.*" /system/build.prop ); then
2929
echo "Not backing up files from incompatible version: $V"
3030
return 0
3131
fi

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
#
33
# Print startup info
44
#
5-
L="log -p i -t slim"
5+
L="log -p i -t aospb"
66

7-
$L "Welcome to Android `getprop ro.build.version.release` / SlimRoms `getprop ro.slim.version`";
7+
$L "Welcome to Android `getprop ro.build.version.release` / AOSPB `getprop ro.aospb.version`";

0 commit comments

Comments
 (0)