commit 47cf57aef29fd05e7bcc994c76a841856b7dc1c7
author Dan Albert <danalbert@google.com> Fri Mar 27 21:41:54 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 27 21:41:54 2015 +0000
tree a6a58ee3e917fb246b6c570eb87acc77a16f1d89
parent 0facd63eae0db3354ee72a572a5fcac990b6b464
parent fbea2209c0b8037fe3234a994d52339c741ef74a

am fbea2209: Merge "Remove uses of libcxx.mk."

* commit 'fbea2209c0b8037fe3234a994d52339c741ef74a':
  Remove uses of libcxx.mk.

keystore/Android.mk

diff --git a/keystore/Android.mk b/keystore/Android.mk
index eb9dd87..3480123 100644
--- a/keystore/Android.mk
+++ b/keystore/Android.mk
@@ -71,7 +71,6 @@
 ifeq ($(USE_32_BIT_KEYSTORE), true)
 LOCAL_MULTILIB := 32
 endif
-include external/libcxx/libcxx.mk
 LOCAL_CFLAGS := -Wall -Wextra -Werror
 LOCAL_SRC_FILES := auth_token_table.cpp
 LOCAL_MODULE := libkeystore_test

keystore/tests/Android.mk

diff --git a/keystore/tests/Android.mk b/keystore/tests/Android.mk
index 6374896..be8c426 100644
--- a/keystore/tests/Android.mk
+++ b/keystore/tests/Android.mk
@@ -21,7 +21,6 @@
 ifeq ($(USE_32_BIT_KEYSTORE), true)
 LOCAL_MULTILIB := 32
 endif
-include external/libcxx/libcxx.mk
 LOCAL_CFLAGS := -Wall -Wextra -Werror
 LOCAL_SRC_FILES := auth_token_table_test.cpp
 LOCAL_MODULE := auth_token_table_test