From b1171e4a317199572dfdc26c7360dc7ee3bcec03 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Wed, 6 Jan 2016 14:08:26 -0800 Subject: [PATCH] Kill BOARD_MALLOC_ALIGNMENT. Bug: http://b/26403338 Change-Id: I55d2c417d972f78caddc5fb28a065807feb86b0a --- core/soong.mk | 1 - target/board/generic_x86/BoardConfig.mk | 3 --- target/board/generic_x86_64/BoardConfig.mk | 3 --- 3 files changed, 7 deletions(-) diff --git a/core/soong.mk b/core/soong.mk index 1d219c172..aab26de94 100644 --- a/core/soong.mk +++ b/core/soong.mk @@ -25,7 +25,6 @@ $(SOONG_VARIABLES): FORCE echo '{'; \ echo ' "Device_uses_jemalloc": $(if $(filter true,$(MALLOC_SVELTE)),false,true),'; \ echo ' "Device_uses_dlmalloc": $(if $(filter true,$(MALLOC_SVELTE)),true,false),'; \ - echo ' $(if $(BOARD_MALLOC_ALIGNMENT),"Dlmalloc_alignment": $(BOARD_MALLOC_ALIGNMENT)$(comma),)'; \ echo ' "Platform_sdk_version": $(PLATFORM_SDK_VERSION),'; \ echo ' "Unbundled_build": $(if $(TARGET_BUILD_APPS),true,false),'; \ echo ' "Brillo": $(if $(BRILLO),true,false),'; \ diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk index a34e4f2fd..44772eb2a 100644 --- a/target/board/generic_x86/BoardConfig.mk +++ b/target/board/generic_x86/BoardConfig.mk @@ -18,9 +18,6 @@ BOARD_USES_GENERIC_AUDIO := true # no hardware camera USE_CAMERA_STUB := true -# customize the malloced address to be 16-byte aligned -BOARD_MALLOC_ALIGNMENT := 16 - # Enable dex-preoptimization to speed up the first boot sequence # of an SDK AVD. Note that this operation only works on Linux for now ifeq ($(HOST_OS),linux) diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk index fda9e45bf..cbfda6b05 100755 --- a/target/board/generic_x86_64/BoardConfig.mk +++ b/target/board/generic_x86_64/BoardConfig.mk @@ -24,9 +24,6 @@ BOARD_USES_GENERIC_AUDIO := true # no hardware camera USE_CAMERA_STUB := true -# customize the malloced address to be 16-byte aligned -BOARD_MALLOC_ALIGNMENT := 16 - # Enable dex-preoptimization to speed up the first boot sequence # of an SDK AVD. Note that this operation only works on Linux for now ifeq ($(HOST_OS),linux)