Changes to allow for dynamically shared library

Change-Id: I23dd64837e4c08e5472d2049bd0be38ade3b3816 (cherry picked from commit d0bb5aee93d37c21c5c1773e40a0daa05c9538d7)
CyanogenMod · Nov 24, 2012 · 9ec176b · 9ec176b · trajano · Nov 24, 2012
1 parent 195680e
commit 9ec176b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/Android.mk b/Android.mk
@@ -373,7 +373,15 @@ LOCAL_CFLAGS += -DSUPPORT_COMPLEX_SCRIPTS=1
 endif
 
 # Build the list of static libraries
-LOCAL_STATIC_LIBRARIES := libxml2 libxslt libhyphenation libskiagpu libv8
+LOCAL_STATIC_LIBRARIES := libxml2 libxslt libhyphenation libskiagpu
+
+ifeq ($(DYNAMIC_SHARED_LIBV8SO),true)
+LOCAL_SHARED_LIBRARIES += libv8
+$(shell mkdir -p $(OUT)/obj/SHARED_LIBRARIES/libv8_intermediates)
+$(shell touch $(OUT)/obj/SHARED_LIBRARIES/libv8_intermediates/export_includes)
+else
+LOCAL_STATIC_LIBRARIES += libv8
+endif
 
 ifeq ($(ENABLE_WEBGL),true)
 LOCAL_STATIC_LIBRARIES += libpng

diff --git a/Source/WebCore/Android.v8bindings.mk b/Source/WebCore/Android.v8bindings.mk
@@ -27,9 +27,15 @@
 
 LOCAL_CFLAGS += -DWTF_USE_V8=1
 
+ifeq ($(DYNAMIC_SHARED_LIBV8SO),true)
 BINDING_C_INCLUDES := \
-	external/v8/include \
-	\
+	vendor/qcom/opensource/v8/include
+else
+BINDING_C_INCLUDES := \
+	external/v8/include
+endif
+
+BINDING_C_INCLUDES += \
 	$(LOCAL_PATH)/bindings/v8 \
 	$(LOCAL_PATH)/bindings/v8/custom \
 	$(LOCAL_PATH)/bindings/v8/specialization \