Merge changes from topic "misc" into q10
* changes:
overlay: Remove Trebuchet config
overlay: Remove Keyguard config
vendor: Add messaging app to power whitelist
overlay: Remove config_show4GForLTE
repopick: Support project paths detection on different branches
common: Bring back Android Beam
diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go
index a8b0ee7..39008d8 100644
--- a/build/soong/android/variable.go
+++ b/build/soong/android/variable.go
@@ -14,7 +14,7 @@
Overrides []string
Shared_libs []string
}
- Should_skip_waiting_for_qsee struct {
+ Should_wait_for_qsee struct {
Cflags []string
}
Supports_hw_fde struct {
@@ -25,9 +25,6 @@
Supports_hw_fde_perf struct {
Cflags []string
}
- Supports_legacy_hw_fde struct {
- Cflags []string
- }
Target_init_vendor_lib struct {
Whole_static_libs []string
}
@@ -77,11 +74,10 @@
Apply_msm8974_1440p_egl_workaround *bool `json:",omitempty"`
Bootloader_message_offset *int `json:",omitempty"`
Has_legacy_camera_hal1 *bool `json:",omitempty"`
- Should_skip_waiting_for_qsee *bool `json:",omitempty"`
+ Should_wait_for_qsee *bool `json:",omitempty"`
Specific_camera_parameter_library *string `json:",omitempty"`
Supports_hw_fde *bool `json:",omitempty"`
Supports_hw_fde_perf *bool `json:",omitempty"`
- Supports_legacy_hw_fde *bool `json:",omitempty"`
Target_init_vendor_lib *string `json:",omitempty"`
Target_process_sdk_version_override *string `json:",omitempty"`
Target_shim_libs *string `json:",omitempty"`
diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk
index 1e01a9a..27f86ff 100644
--- a/build/soong/soong_config.mk
+++ b/build/soong/soong_config.mk
@@ -8,11 +8,10 @@
$(call add_json_bool, Apply_msm8974_1440p_egl_workaround, $(filter true,$(TARGET_MSM8974_1440P_EGL_WORKAROUND)))
$(call add_json_val_default, Bootloader_message_offset, $(BOOTLOADER_MESSAGE_OFFSET), 0)
$(call add_json_bool, Has_legacy_camera_hal1, $(filter true,$(TARGET_HAS_LEGACY_CAMERA_HAL1)))
-$(call add_json_bool, Should_skip_waiting_for_qsee, $(filter true,$(TARGET_KEYMASTER_SKIP_WAITING_FOR_QSEE)))
+$(call add_json_bool, Should_wait_for_qsee, $(filter true,$(TARGET_KEYMASTER_WAIT_FOR_QSEE)))
$(call add_json_str, Specific_camera_parameter_library, $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY))
$(call add_json_bool, Supports_hw_fde, $(filter true,$(TARGET_HW_DISK_ENCRYPTION)))
$(call add_json_bool, Supports_hw_fde_perf, $(filter true,$(TARGET_HW_DISK_ENCRYPTION_PERF)))
-$(call add_json_bool, Supports_legacy_hw_fde, $(filter true,$(TARGET_LEGACY_HW_DISK_ENCRYPTION)))
$(call add_json_str_omitempty, Target_init_vendor_lib, $(TARGET_INIT_VENDOR_LIB))
$(call add_json_str_omitempty, Target_process_sdk_version_override, $(TARGET_PROCESS_SDK_VERSION_OVERRIDE))
$(call add_json_str_omitempty, Target_shim_libs, $(subst $(space),:,$(TARGET_LD_SHIM_LIBS)))
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index 73f1f6e..1b6c2f9 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -48,7 +48,7 @@
if [ ! -r $S/build.prop ]; then
return 0
fi
-if ! grep -q "^ro.lineage.version=$V.*" $S/build.prop; then
+if ! grep -q "^ro.bliss.version=$V.*" $S/build.prop; then
echo "Not backing up files from incompatible version: $V"
return 0
fi
diff --git a/prebuilt/common/bin/backuptool_ab.sh b/prebuilt/common/bin/backuptool_ab.sh
index 157110f..dde4bbd 100755
--- a/prebuilt/common/bin/backuptool_ab.sh
+++ b/prebuilt/common/bin/backuptool_ab.sh
@@ -50,7 +50,7 @@
return 0
fi
-grep -q "^ro.lineage.version=$V.*" /system/build.prop && return 1
+grep -q "^ro.bliss.version=$V.*" /system/build.prop && return 1
echo "Not backing up files from incompatible version: $V"
return 0