aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools/android/tests/expectations/Android.mk
diff options
context:
space:
mode:
authorGravatar scroggo <scroggo@google.com>2014-11-12 11:52:23 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2014-11-12 11:52:23 -0800
commit8338a9a855cf5e5127dcb62e48d5036b1ad2f29b (patch)
tree24030b6feb29291c22bf807b5299c2a09b7dbc80 /platform_tools/android/tests/expectations/Android.mk
parent09a79d09981ee363b1518bb40c108e6266bc28c6 (diff)
Reland "Move from libstlport to libc++ for Android framework builds" (patchset #1 id:1 of https://codereview.chromium.org/718793003/)
> Original issue's description: > > Move from libstlport to libc++ for Android framework builds > > > > Committed: https://skia.googlesource.com/skia/+/ce259510a738fab05a0d456440104f5aba1c9d72 > > TBR=tomhudson@google.com,djsollen@google.com > NOTREECHECKS=true > NOTRY=true > > Committed: https://skia.googlesource.com/skia/+/3c3fe7ce4893204eb8bcf885e8a1d539763bca5d TBR=tomhudson@google.com,djsollen@google.com NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/717303002
Diffstat (limited to 'platform_tools/android/tests/expectations/Android.mk')
-rw-r--r--platform_tools/android/tests/expectations/Android.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/platform_tools/android/tests/expectations/Android.mk b/platform_tools/android/tests/expectations/Android.mk
index f5fbc29209..daa2125acd 100644
--- a/platform_tools/android/tests/expectations/Android.mk
+++ b/platform_tools/android/tests/expectations/Android.mk
@@ -148,7 +148,6 @@ LOCAL_MODULE_TAGS_bar += \
LOCAL_MODULE_bar += \
local_module_bar
-include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY)
#############################################################