commit a2f088b6775f0cd0a8b7e3b35e16f13de3f67b01
author Deepanshu Gupta <deepanshu@google.com> Thu Oct 02 03:26:21 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 02 03:26:22 2014 +0000
tree 6a378533a73277de546fa71afcb6597ee301048d
parent 541e6e5d47b928f3cd73f9e8f1da83ff722892c8
parent 6fb5fdc23364f922cb2c554f52b6927925d1fb15

Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev

tools/layoutlib/bridge/tests/Android.mk

diff --git a/tools/layoutlib/bridge/tests/Android.mk b/tools/layoutlib/bridge/tests/Android.mk
index 7a9e067..5e47c8c 100644
--- a/tools/layoutlib/bridge/tests/Android.mk
+++ b/tools/layoutlib/bridge/tests/Android.mk
@@ -34,5 +34,8 @@
 
 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))

tools/layoutlib/create/tests/Android.mk

diff --git a/tools/layoutlib/create/tests/Android.mk b/tools/layoutlib/create/tests/Android.mk
index 0052ec2..c197d57 100644
--- a/tools/layoutlib/create/tests/Android.mk
+++ b/tools/layoutlib/create/tests/Android.mk
@@ -28,5 +28,8 @@
 
 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))