commit fb33854fd7dc4f31182f7feff0ee87e84d4f74af
author Dan Albert <danalbert@google.com> Fri Sep 26 20:38:29 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 26 20:38:30 2014 +0000
tree 37ef817d31639335950a5c57d08e609934b70b8d
parent d6f2c76fdb9b0469261fa2db0b29ed48c7ac38b5
parent 498d6e3a415c8fd681828abdf6394a5c4406de0d

Merge "Don't manually link stlport."

Android.mk

diff --git a/Android.mk b/Android.mk
index 42b3c48..57cf1c6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -31,6 +31,7 @@
 #
 
 include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_ARM_MODE := thumb
 
@@ -661,8 +662,7 @@
 
 LOCAL_MODULE:= libskia
 
-#include stlport headers
-include external/stlport/libstlport.mk
+LOCAL_CXX_STL := stlport
 
 include $(BUILD_SHARED_LIBRARY)
 

bench/Android.mk

diff --git a/bench/Android.mk b/bench/Android.mk
index c4d1036..ec33a4f 100644
--- a/bench/Android.mk
+++ b/bench/Android.mk
@@ -1,6 +1,7 @@
 
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_SRC_FILES := \
   benchmain.cpp \
@@ -93,8 +94,6 @@
 
 LOCAL_SHARED_LIBRARIES := libcutils libskia libGLESv2 libEGL 
 
-LOCAL_STATIC_LIBRARIES := libstlport_static
-
 LOCAL_C_INCLUDES := \
   external/skia/src/core \
   external/skia/src/effects \
@@ -110,7 +109,6 @@
 # unecessary log spew when building
 LOCAL_CFLAGS := -Wno-unused-parameter
 
-#include stlport headers
-include external/stlport/libstlport.mk
+LOCAL_CXX_STL := stlport_static
 
 include $(BUILD_EXECUTABLE)

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 4b15831..ed83824 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
-
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_SRC_FILES:= \
   AAClipTest.cpp \
@@ -166,15 +166,12 @@
 
 LOCAL_SHARED_LIBRARIES := libcutils libskia libGLESv2 libEGL
 
-LOCAL_STATIC_LIBRARIES := libstlport_static
-
 LOCAL_MODULE_TAGS := eng tests
 
 # Skia does not enforce this usage pattern so we disable it here to avoid
 # unecessary log spew when building
 LOCAL_CFLAGS := -Wno-unused-parameter
 
-#include stlport headers
-include external/stlport/libstlport.mk
+LOCAL_CXX_STL := stlport_static
 
 include $(BUILD_EXECUTABLE)