Merge changes from topic "vendor" into q10
* changes:
build: Remove qcom power HAL pathmap
Revert "config: Use tether automatic upstream selection"
common: Clean up debug packages
kernel: Define DTBS_OUT path for dtb.img building
diff --git a/build/core/qcom_target.mk b/build/core/qcom_target.mk
index 8fa1be9..7bb7a76 100644
--- a/build/core/qcom_target.mk
+++ b/build/core/qcom_target.mk
@@ -17,7 +17,6 @@
$(call set-device-specific-path,BT_VENDOR,bt-vendor,hardware/qcom-caf/bt)
$(call set-device-specific-path,DATA_IPA_CFG_MGR,data-ipa-cfg-mgr,vendor/qcom/opensource/data-ipa-cfg-mgr)
$(call set-device-specific-path,DATASERVICES,dataservices,vendor/qcom/opensource/dataservices)
-$(call set-device-specific-path,POWER,power,hardware/qcom-caf/power)
$(call set-device-specific-path,THERMAL,thermal,hardware/qcom-caf/thermal)
$(call set-device-specific-path,VR,vr,hardware/qcom-caf/vr)
$(call set-device-specific-path,WLAN,wlan,hardware/qcom-caf/wlan)
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index a1b35e4..270627a 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -64,6 +64,7 @@
SELINUX_DEFCONFIG := $(TARGET_KERNEL_SELINUX_CONFIG)
## Internal variables
+DTBS_OUT := $(PRODUCT_OUT)/dtbs
KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ
KERNEL_CONFIG := $(KERNEL_OUT)/.config
KERNEL_RELEASE := $(KERNEL_OUT)/include/config/kernel.release
@@ -217,7 +218,7 @@
# Make a DTB targets
# $(1): The DTB target to build (eg. dtbs, defconfig)
define make-dtb-target
-$(call internal-make-kernel-target,$(PRODUCT_OUT)/dtbs,$(1))
+$(call internal-make-kernel-target,$(DTBS_OUT),$(1))
endef
$(KERNEL_OUT):
diff --git a/config/bliss_packages.mk b/config/bliss_packages.mk
index e115ec9..5460e85 100644
--- a/config/bliss_packages.mk
+++ b/config/bliss_packages.mk
@@ -51,10 +51,7 @@
# These packages are excluded from user builds
PRODUCT_PACKAGES_DEBUG += \
- micro_bench \
- procmem \
- procrank \
- strace
+ procmem
# Bliss Packages
PRODUCT_PACKAGES += \
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index a5cf063..f6fd41c 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -89,11 +89,6 @@
<!-- Whether or not we should show the option to show battery percentage -->
<bool name="config_battery_percentage_setting_available">true</bool>
-
- <!-- When true, the tethering upstream network follows the current default
- Internet network (except when the current default network is mobile,
- in which case a DUN network will be used if required). -->
- <bool name="config_tether_upstream_automatic">true</bool>
<!-- Component name for default assistant on this device -->
<string name="config_defaultAssistantComponentName">com.google.android.googlequicksearchbox/com.google.android.voiceinteraction.GsaVoiceInteractionService</string>