From 8b266f16a90d072dc47415b9332782a0a86292a4 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Mon, 22 Jun 2020 19:42:59 +0900 Subject: [PATCH] Don't inherit tablet-dalvik-heap for GSI and emulator GSI and emulator should not be specialized for tablet. This is also to avoid the expected sysprop conflict after I9c073a21c8257987cf2378012cadaeeeb698a4fb gets in. With the change, duplicate assignments of a sysprop is prohibited. We currently have the duplication due to the following hierarchy chain: aosp_arm64.mk -> emulator_vendor.mk -> goldfish/vendor.mk -> phone-xhdpi-2048-dalvik-heap.mk -> generic_arm64/device.mk -> tablet-dalvik-heap.mk Many of the dalvik.vm.* properties are duplicated between phone-*- dalvik-heap.mk and tablet-dalvik-heap.mk files. Bug: 117892318 Bug: 158735147 Test: atest --host post_process_prop_unittest Exempt-From-Owner-Approval: cherry-pick from master Merged-In: I4d1e2f819fe688a4a85e58387b6af58d603399d3 (cherry picked from commit 9f2f6dd9c9a48b526742a3ca8e21328ac3355b9f) Change-Id: I4d1e2f819fe688a4a85e58387b6af58d603399d3 --- target/board/emulator_arm64/device.mk | 4 ---- target/board/generic_arm64/device.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/target/board/emulator_arm64/device.mk b/target/board/emulator_arm64/device.mk index 57675d02de..73dc2f4c4f 100644 --- a/target/board/emulator_arm64/device.mk +++ b/target/board/emulator_arm64/device.mk @@ -26,7 +26,3 @@ endif PRODUCT_COPY_FILES += \ $(LOCAL_KERNEL):kernel - -# Adjust the Dalvik heap to be appropriate for a tablet. -$(call inherit-product-if-exists, frameworks/base/build/tablet-dalvik-heap.mk) -$(call inherit-product-if-exists, frameworks/native/build/tablet-dalvik-heap.mk) diff --git a/target/board/generic_arm64/device.mk b/target/board/generic_arm64/device.mk index 3b7cd44acb..b34004fd76 100644 --- a/target/board/generic_arm64/device.mk +++ b/target/board/generic_arm64/device.mk @@ -18,7 +18,3 @@ PRODUCT_COPY_FILES += \ device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4:kernel-5.4 \ device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4-gz:kernel-5.4-gz \ device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4-lz4:kernel-5.4-lz4 - -# Adjust the Dalvik heap to be appropriate for a tablet. -$(call inherit-product-if-exists, frameworks/base/build/tablet-dalvik-heap.mk) -$(call inherit-product-if-exists, frameworks/native/build/tablet-dalvik-heap.mk)