commit 20a0ad6c980e969aa007fe72ad7218644be62193
author Ying Wang <wangying@google.com> Thu Mar 13 10:25:16 2014 -0700
committer Ying Wang <wangying@google.com> Thu Mar 13 10:25:16 2014 -0700
tree 976c9d2f56feba90301c5a971f98a7d0c2ca98c7
parent ef5fd436699885f8b5427f5e32029c2ddae122eb

Fix multilib build.

Change-Id: I403b832319585b04edf69a27474dcdd23982b93b

Android.mk

diff --git a/Android.mk b/Android.mk
index 09db6e4..2de40ec 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,7 +12,7 @@
 
 LOCAL_MODULE := libchromium_net
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-INTERMEDIATES := $(call local-intermediates-dir)
+INTERMEDIATES := $(call local-generated-sources-dir)
 
 LOCAL_SRC_FILES := \
     googleurl/src/gurl.cc \
@@ -46,10 +46,8 @@
     app/sql/statement.cc \
     app/sql/transaction.cc \
 
-ifeq ($(TARGET_$(combo_2nd_arch_prefix)ARCH),x86)
-LOCAL_SRC_FILES += \
+LOCAL_SRC_FILES_x86 += \
     base/atomicops_internals_x86_gcc.cc
-endif
 
 LOCAL_SRC_FILES += \
     base/at_exit.cc \
@@ -482,8 +480,6 @@
 LOCAL_STATIC_LIBRARIES := libevent modp_b64 dmg_fp
 LOCAL_SHARED_LIBRARIES := libstlport libexpat libcrypto libssl libz libicuuc libicui18n libsqlite libcutils liblog libdl
 
-LOCAL_PRELINK_MODULE := false
-
 # Including this will modify the include path
 include external/stlport/libstlport.mk