summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.co>2014-08-01 14:17:08 -0700
committerBen Murdoch <benm@google.com>2014-08-07 15:42:50 +0000
commitb1300bde9cc0528ff84b91ed60ac80655218b4b0 (patch)
treec4fa33ff4115bfb2ec125adb90670f0e6f16359c
parentedd7eb0fda6f078e53317675361c869b046b53e1 (diff)
downloadexternal_libcxx-b1300bde9cc0528ff84b91ed60ac80655218b4b0.tar.gz
external_libcxx-b1300bde9cc0528ff84b91ed60ac80655218b4b0.tar.bz2
external_libcxx-b1300bde9cc0528ff84b91ed60ac80655218b4b0.zip
Exclude only modules with prebuilt in prebuilts/sdk.
So we can do tapas build in the full platform source tree. Change-Id: I4c64d1007d1e295518ed6338b46d1087714b68aa (cherry picked from commit 9dd567a7d51065029e7b1c1d3d08bcb00f063c09)
-rw-r--r--Android.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 65b44b713..782b7cb2a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,9 +14,6 @@
# limitations under the License.
#
-# Don't build for unbundled branches
-ifeq (,$(TARGET_BUILD_APPS))
-
LOCAL_PATH := $(call my-dir)
LIBCXX_SRC_FILES := \
@@ -101,6 +98,9 @@ endif
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include $(BUILD_HOST_STATIC_LIBRARY)
+# Don't build for unbundled branches
+ifeq (,$(TARGET_BUILD_APPS))
+
# host dynamic lib
include $(CLEAR_VARS)
LOCAL_MODULE := libc++