summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2012-10-03 11:01:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-03 11:01:26 -0700
commit2223fae1c84102caf4e70e659996bd1cd26732e8 (patch)
treeba51e4eac346bb062a01f6bd770fe5c8b35e12fb
parent34ab1d80d200bf4ea86a5e108c7c7ddf36419852 (diff)
parent16331d95a6d3749fa33f0030dd4cd0a287802d53 (diff)
downloadsdk-2223fae1c84102caf4e70e659996bd1cd26732e8.tar.gz
am 16331d95: am 6ab59c98: am 7337fade: Add prebuilts/sdk/16/uiautomator.jar as of JZO54K #485486
* commit '16331d95a6d3749fa33f0030dd4cd0a287802d53': Add prebuilts/sdk/16/uiautomator.jar as of JZO54K #485486
-rw-r--r--16/uiautomator.jarbin0 -> 8413 bytes
-rw-r--r--Android.mk13
2 files changed, 11 insertions, 2 deletions
diff --git a/16/uiautomator.jar b/16/uiautomator.jar
new file mode 100644
index 000000000..5da623e93
--- /dev/null
+++ b/16/uiautomator.jar
Binary files differ
diff --git a/Android.mk b/Android.mk
index 0522e76f4..4b7d5a0eb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,9 +26,18 @@ $$(_cpsttrp_sdk_intermediates)/classes.jar : $$(_cpsttrp_src_jar) | $(ACP)
$$(_cpsttrp_sdk_intermediates)/javalib.jar : $$(_cpsttrp_sdk_intermediates)/classes.jar | $(ACP)
$$(call copy-file-to-target)
+
+# The uiautomator.jar
+_cpsttrp_src_jar := $(LOCAL_PATH)/$(1)/uiautomator.jar
+# The uiautomator library should be referenced as "LOCAL_JAVA_LIBRARIES += uiautomator_sdk_v<version>".
+_cpsttrp_sdk_intermediates := $(call intermediates-dir-for,JAVA_LIBRARIES,uiautomator_sdk_v$(1),,COMMON)
+$$(_cpsttrp_sdk_intermediates)/classes.jar : $$(_cpsttrp_src_jar) | $(ACP)
+ $$(call copy-file-to-target)
+
+$$(_cpsttrp_sdk_intermediates)/javalib.jar : $$(_cpsttrp_sdk_intermediates)/classes.jar | $(ACP)
+ $$(call copy-file-to-target)
endef
-_historic_sdk_versions := $(TARGET_AVAILABLE_SDK_VERSIONS)
-$(foreach s,$(_historic_sdk_versions),$(eval $(call _copy_prebuilt_sdk_to_the_right_place,$(s))))
+$(foreach s,$(TARGET_AVAILABLE_SDK_VERSIONS),$(eval $(call _copy_prebuilt_sdk_to_the_right_place,$(s))))
include $(call all-makefiles-under,$(LOCAL_PATH))