Merge "Run e2fsck only when building images with the target files." into jb-mr2-dev
diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk
index 4f35ea7..c6a155a 100644
--- a/core/combo/HOST_linux-x86.mk
+++ b/core/combo/HOST_linux-x86.mk
@@ -42,7 +42,8 @@
HOST_GLOBAL_CFLAGS += -m64
HOST_GLOBAL_LDFLAGS += -m64
else
-HOST_GLOBAL_CFLAGS += -m32
+# We expect SSE3 floating point math.
+HOST_GLOBAL_CFLAGS += -mstackrealign -msse3 -mfpmath=sse -m32
HOST_GLOBAL_LDFLAGS += -m32
endif # BUILD_HOST_64bit
diff --git a/core/definitions.mk b/core/definitions.mk
index 69e7baa..e895f95 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -538,7 +538,7 @@
# $(1): library name
# $(2): Non-empty if IS_HOST_MODULE
define _java-lib-full-dep
-$(call _java-lib-dir,$(1),$(2))/javalib$(COMMON_JAVA_PACKAGE_SUFFIX)
+$(call _java-lib-dir,$(1),$(2))/$(if $(2),javalib,classes)$(COMMON_JAVA_PACKAGE_SUFFIX)
endef
# $(1): library name list
@@ -823,7 +823,7 @@
endef
define transform-bc-to-so
-@echo "Renderscript compatibility"
+@echo "Renderscript compatibility: $(notdir $@) <= $(notdir $<)"
$(hide) mkdir -p $(dir $@)
$(hide) $(BCC_COMPAT) -O3 -o $(dir $@)/$(notdir $(<:.bc=.o)) -fPIC -shared \
-rt-path $(PRIVATE_LIBCLCORE) $<
diff --git a/core/java.mk b/core/java.mk
index a7a5dad..22b4e75 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -280,7 +280,6 @@
ifneq (,$(strip $(installed_rs_compatibility_jni_libs)))
$(installed_rs_compatibility_jni_libs) : $(TARGET_OUT_SHARED_LIBRARIES)/lib%.so : \
$(renderscript_intermediate)/lib%.so
- @echo "Install RS compatibility library: $@"
$(hide) mkdir -p $(dir $@) && cp -f $< $@
# Install them only if the current module is installed.
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index f7a65db..3226423 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -83,6 +83,7 @@
PRODUCT_PACKAGE_OVERLAYS := development/sdk_overlay
PRODUCT_COPY_FILES := \
+ device/generic/goldfish/fstab.goldfish:root/fstab.goldfish \
device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \
system/core/rootdir/etc/vold.fstab:system/etc/vold.fstab \
frameworks/base/data/sounds/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \