diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index d4f5c6b..3e1bd35 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -158,6 +158,3 @@ TARGET_LD_SHIM_LIBS := \ /system/vendor/lib/libril-qc-qmi-1.so|libshims_ril.so \ /system/lib/libril-qc-qmi-1.so|libshims_ril.so \ /system/lib/libui.so|libui_shim.so - -# Tweaks for 'low ram' devices --include device/htc/msm8960-common/lowram/BoardConfig.mk diff --git a/lowram/BoardConfig.mk b/lowram/BoardConfig.mk deleted file mode 100644 index 7a2b5a8..0000000 --- a/lowram/BoardConfig.mk +++ /dev/null @@ -1,5 +0,0 @@ -# Low Memory Devices -MALLOC_SVELTE := true - -# Dedupe VNDK libraries with identical core variants. -TARGET_VNDK_USE_CORE_VARIANT := true diff --git a/lowram/device.mk b/lowram/device.mk deleted file mode 100644 index a67428c..0000000 --- a/lowram/device.mk +++ /dev/null @@ -1,25 +0,0 @@ -# Speed profile services and wifi-service to reduce RAM and storage. -PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := speed-profile - -# Always preopt extracted APKs to prevent extracting out of the APK for gms -# modules. -PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK := true - -# Use a profile based boot image for this device. Note that this is currently a -# generic profile and not Android Go optimized. -PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE := true -PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION := frameworks/base/config/boot-image-profile.txt - -# Do not generate libartd. -PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD := false - -# Strip the local variable table and the local variable type table to reduce -# the size of the system image. This has no bearing on stack traces, but will -# leave less information available via JDWP. -PRODUCT_MINIMIZE_JAVA_DEBUG_INFO := true - -# Disable Scudo outside of eng builds to save RAM. -PRODUCT_DISABLE_SCUDO := true - -# Do not spin up a separate process for the network stack on go devices, use an in-process APK. -PRODUCT_PACKAGES += InProcessNetworkStack diff --git a/msm8960.mk b/msm8960.mk index 4dbe860..f634960 100644 --- a/msm8960.mk +++ b/msm8960.mk @@ -14,8 +14,7 @@ # limitations under the License. # -# Tweaks for 'low ram' devices -$(call inherit-product-if-exists, $(LOCAL_PATH)/lowram/device.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/go_defaults.mk) # Dalvik vm configs PRODUCT_PROPERTY_OVERRIDES += \