commit 031bff45d051b0cdfcfdca4e35a3ab213e105fce
author JP Abgrall <jpa@google.com> Thu Feb 27 18:04:35 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 27 18:04:35 2014 +0000
tree c745d3f398c4c7b658a8e8f317559de6df503f22
parent cd07521f464985373fc4fe13812b5f465373bda5
parent 352bbe5c9cf7e709f522c85f833766754d599037

Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"

target/board/generic_x86/BoardConfig.mk

diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk
index 5da767e..a34804a 100644
--- a/target/board/generic_x86/BoardConfig.mk
+++ b/target/board/generic_x86/BoardConfig.mk
@@ -10,7 +10,6 @@
 TARGET_ARCH := x86
 TARGET_ARCH_VARIANT := x86
 TARGET_PRELINK_MODULE := false
-TARGET_USES_64_BIT_BINDER := true
 
 # The IA emulator (qemu) uses the Goldfish devices
 HAVE_HTC_AUDIO_DRIVER := true

target/product/core_minimal.mk

diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 17000ac..eb8d653 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -53,6 +53,7 @@
     libfilterfw \
     libsqlite_jni \
     libwilhelm \
+    logd \
     make_ext4fs \
     screencap \
     sensorservice \