Merge "omni: add EmptyOverlay" into android-10
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index c0e0c4d..57eb0bd 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -53,6 +53,8 @@
# modules in root instead of vendor
# NEED_KERNEL_MODULE_SYSTEM = Optional, if true, install kernel
# modules in system instead of vendor
+# NEED_KERNEL_MODULE_VENDOR_OVERLAY = Optional, if true, install kernel
+# modules in vendor overlay instead of vendor
ifneq ($(TARGET_NO_KERNEL),true)
@@ -156,6 +158,10 @@
KERNEL_MODULES_OUT := $(TARGET_OUT)
KERNEL_DEPMOD_STAGING_DIR := $(KERNEL_BUILD_OUT_PREFIX)$(call intermediates-dir-for,PACKAGING,depmod_system)
KERNEL_MODULE_MOUNTPOINT := system
+else ifeq ($(NEED_KERNEL_MODULE_VENDOR_OVERLAY),true)
+KERNEL_MODULES_OUT := $(TARGET_OUT_PRODUCT)/vendor_overlay/29
+KERNEL_DEPMOD_STAGING_DIR := $(KERNEL_BUILD_OUT_PREFIX)$(call intermediates-dir-for,PACKAGING,depmod_product)
+KERNEL_MODULE_MOUNTPOINT := product
else
KERNEL_MODULES_OUT := $(TARGET_OUT_VENDOR)
KERNEL_DEPMOD_STAGING_DIR := $(KERNEL_BUILD_OUT_PREFIX)$(call intermediates-dir-for,PACKAGING,depmod_vendor)
diff --git a/overlay/CarrierConfig/packages/apps/CarrierConfig/res/xml/vendor.xml b/overlay/CarrierConfig/packages/apps/CarrierConfig/res/xml/vendor.xml
index 84b1077..1b46326 100644
--- a/overlay/CarrierConfig/packages/apps/CarrierConfig/res/xml/vendor.xml
+++ b/overlay/CarrierConfig/packages/apps/CarrierConfig/res/xml/vendor.xml
@@ -1682,6 +1682,7 @@
<string name="vendor_carrier_eons_short">TMO</string>
<boolean name="use_only_rsrp_for_lte_signal_bar_bool" value="true" />
<string name="wcdma_default_signal_strength_measurement_string">rscp</string>
+ <boolean name="carrier_vt_available_bool" value="true" />
</carrier_config>
<carrier_config mcc="310" mnc="160">
<boolean name="carrier_vt_available_bool" value="true" />
@@ -2091,6 +2092,12 @@
</carrier_config>
<carrier_config mcc="404" mnc="10">
<boolean name="carrier_volte_available_bool" value="true" />
+ <boolean name="carrier_wfc_ims_available_bool" value="true" />
+ </carrier_config>
+ <carrier_config mcc="404" mnc="11">
+ <boolean name="config_force_send_sms_over_cs" value="true" />
+ <boolean name="carrier_volte_available_bool" value="true" />
+ <boolean name="carrier_wfc_ims_available_bool" value="true" />
</carrier_config>
<carrier_config mcc="404" mnc="16">
<boolean name="carrier_volte_available_bool" value="true" />
@@ -2196,10 +2203,6 @@
<boolean name="carrier_volte_available_bool" value="true" />
<boolean name="config_force_send_sms_over_cs" value="true" />
</carrier_config>
- <carrier_config mcc="404" mnc="11">
- <boolean name="carrier_volte_available_bool" value="true" />
- <boolean name="config_force_send_sms_over_cs" value="true" />
- </carrier_config>
<carrier_config mcc="404" mnc="13">
<boolean name="carrier_volte_available_bool" value="true" />
<boolean name="config_force_send_sms_over_cs" value="true" />
diff --git a/prebuilt/bin/backuptool.functions b/prebuilt/bin/backuptool.functions
index 2734446..ff599f1 100644
--- a/prebuilt/bin/backuptool.functions
+++ b/prebuilt/bin/backuptool.functions
@@ -3,9 +3,6 @@
# Functions for backuptool.sh
#
-export C=/tmp/backupdir
-export S=/system
-
DEBUG=0
backup_file() {
diff --git a/prebuilt/bin/backuptool.sh b/prebuilt/bin/backuptool.sh
index edf21e5..4e54456 100755
--- a/prebuilt/bin/backuptool.sh
+++ b/prebuilt/bin/backuptool.sh
@@ -4,7 +4,7 @@
#
export C=/tmp/backupdir
-export S=/system
+export S=$2
export V=10
export ADDOND_VERSION=1
@@ -15,7 +15,7 @@
preserve_addon_d() {
rm -rf /tmp/addon.d/
mkdir -p /tmp/addon.d/
- cp -a /system/addon.d/* /tmp/addon.d/
+ cp -a $S/addon.d/* /tmp/addon.d/
# Discard any scripts that aren't at least our version level
for f in /postinstall/tmp/addon.d/*sh; do
SCRIPT_VERSION=$(grep "^# ADDOND_VERSION=" $f | cut -d= -f2)
@@ -31,7 +31,7 @@
# Restore /system/addon.d in /tmp/addon.d
restore_addon_d() {
- cp -a /tmp/addon.d/* /system/addon.d/
+ cp -a /tmp/addon.d/* $S/addon.d/
rm -rf /tmp/addon.d/
}
@@ -49,12 +49,12 @@
}
check_blacklist() {
- if [ -f /system/addon.d/blacklist ];then
+ if [ -f $S/addon.d/blacklist ];then
## Discard any known bad backup scripts
- cd /$1/addon.d/
+ cd $1/addon.d/
for f in *sh; do
s=$(md5sum $f | awk {'print $1'})
- grep -q $s /system/addon.d/blacklist && rm -f $f
+ grep -q $s $S/addon.d/blacklist && rm -f $f
done
fi
}
@@ -73,20 +73,20 @@
backup)
# make sure we dont start with any leftovers
rm -rf $C
- cp /system/bin/backuptool.functions /tmp
- cp /system/build.prop /tmp
+ cp $S/bin/backuptool.functions /tmp
+ cp $S/build.prop /tmp
mkdir -p $C
#check_prereq
- check_blacklist system
+ check_blacklist $S
preserve_addon_d
run_stage pre-backup
run_stage backup
run_stage post-backup
;;
restore)
- cp /system/bin/backuptool.functions /tmp
+ cp $S/bin/backuptool.functions /tmp
check_prereq
- check_blacklist tmp
+ check_blacklist /tmp
run_stage pre-restore
run_stage restore
run_stage post-restore