diff options
author | Xavier Ducrohet <xav@android.com> | 2012-01-27 16:06:40 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-27 16:06:40 -0800 |
commit | d3ddd843a71f966ed256ea4c21f4b50c6fd735d2 (patch) | |
tree | 1d27b500f8327130f528bcbd050b4fb40300e519 /build | |
parent | 7abf0861af9f6afe854bafa6d43d9d1feba8b552 (diff) | |
parent | 16234ae8bff35630ea6f19f5ffde5df1f8bff669 (diff) | |
download | sdk-d3ddd843a71f966ed256ea4c21f4b50c6fd735d2.zip sdk-d3ddd843a71f966ed256ea4c21f4b50c6fd735d2.tar.gz sdk-d3ddd843a71f966ed256ea4c21f4b50c6fd735d2.tar.bz2 |
Merge "Support annotations for backward compatibility."
Diffstat (limited to 'build')
-rw-r--r-- | build/sdk_only_whitelist.mk | 1 | ||||
-rw-r--r-- | build/tools.atree | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/build/sdk_only_whitelist.mk b/build/sdk_only_whitelist.mk index 7c2a2ae..bb00a7f 100644 --- a/build/sdk_only_whitelist.mk +++ b/build/sdk_only_whitelist.mk @@ -40,6 +40,7 @@ ifneq (,$(shell which javac 2>/dev/null)) subdirs += \ sdk/archquery \ sdk/androidprefs \ + sdk/annotations \ sdk/apkbuilder \ sdk/assetstudio \ sdk/common \ diff --git a/build/tools.atree b/build/tools.atree index 92985bb..23a0d7c 100644 --- a/build/tools.atree +++ b/build/tools.atree @@ -147,6 +147,9 @@ prebuilts/tools/common/proguard/proguard4.7/src/proguard/ant/task.properties to # SDK Controller sdk/apps/SdkController tools/apps/SdkController +# tools specific support jar +framework/annotations.jar tools/support/annotations.jar + ############################################################################## # Tests Component ############################################################################## |