summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Deepanshu Gupta <deepanshu@google.com> 2014-09-09 00:30:23 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-09-09 00:30:24 +0000
commit93b828de58f02ab85371cb1eaa7f1a23a03a609e (patch)
treefebac1e3f05fa1eec122b38d842a1c0bfc9c05bc
parentfa4e214814b795350366225b76e1ae6e3224b91d (diff)
parenta0904bf7aa0ec7a954b5740c67bd922171c72ca1 (diff)
Merge "Add layoutlib tests to DIST_DIR" into lmp-dev
-rw-r--r--tools/layoutlib/bridge/tests/Android.mk3
-rw-r--r--tools/layoutlib/create/tests/Android.mk3
2 files changed, 6 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/tests/Android.mk b/tools/layoutlib/bridge/tests/Android.mk
index 7a9e0678ddab..5e47c8c2bfb1 100644
--- a/tools/layoutlib/bridge/tests/Android.mk
+++ b/tools/layoutlib/bridge/tests/Android.mk
@@ -34,5 +34,8 @@ LOCAL_JAVA_LIBRARIES := layoutlib \
include $(BUILD_HOST_JAVA_LIBRARY)
+# Copy the jar to DIST_DIR for sdk builds
+$(call dist-for-goals, sdk win_sdk, $(LOCAL_INSTALLED_MODULE))
+
# Build all sub-directories
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tools/layoutlib/create/tests/Android.mk b/tools/layoutlib/create/tests/Android.mk
index 0052ec2f39e4..c197d5733658 100644
--- a/tools/layoutlib/create/tests/Android.mk
+++ b/tools/layoutlib/create/tests/Android.mk
@@ -28,5 +28,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := asm-4.0
include $(BUILD_HOST_JAVA_LIBRARY)
+# Copy the jar to DIST_DIR for sdk builds
+$(call dist-for-goals, sdk win_sdk, $(LOCAL_INSTALLED_MODULE))
+
# Build all sub-directories
include $(call all-makefiles-under,$(LOCAL_PATH))