summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2012-08-14 16:38:02 -0700
committerYing Wang <wangying@google.com>2012-08-14 16:38:02 -0700
commit020d4ab4fa296d4e3a6d1f16aed97738bbc55f43 (patch)
tree7bf736f14f932572abb452afe1f03f6481f4561c
parented7df702bdff3f60c685e1d64c80f712585193f6 (diff)
downloadandroid_development-020d4ab4fa296d4e3a6d1f16aed97738bbc55f43.tar.gz
android_development-020d4ab4fa296d4e3a6d1f16aed97738bbc55f43.tar.bz2
android_development-020d4ab4fa296d4e3a6d1f16aed97738bbc55f43.zip
Establish the dependency on the uiautomator stubs.
Bug: 6876802 Change-Id: I27dae218b798f4e939d37ee32238e7d489623a40
-rw-r--r--build/Android.mk2
-rw-r--r--build/sdk.atree2
2 files changed, 3 insertions, 1 deletions
diff --git a/build/Android.mk b/build/Android.mk
index 967242790..b66b7dd3f 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -101,6 +101,8 @@ $(android_jar_full_target): $(full_target)
ALL_SDK_FILES += $(android_jar_full_target)
+# The uiautomator stubs
+ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_uiautomator_intermediates/javalib.jar
# $(1): the Java library name
define _package_sdk_library
diff --git a/build/sdk.atree b/build/sdk.atree
index 5727c06df..e0c25bad4 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -71,7 +71,7 @@ sdk/sdk-build.prop platforms/${PLATFORM_NAME}/build.p
# the uper-jar file that apps link against. This is the public API
${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android.jar platforms/${PLATFORM_NAME}/android.jar
-${OUT_DIR}/target/product/generic/system/framework/uiautomator.jar platforms/${PLATFORM_NAME}/uiautomator.jar
+${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android_uiautomator_intermediates/javalib.jar platforms/${PLATFORM_NAME}/uiautomator.jar
# the aidl precompiled include
obj/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl