Merge commit 'goog/readonly-korg-master' into HEAD

This commit is contained in:
The Android Open Source Project
2010-05-06 15:07:55 -07:00

View File

@@ -67,16 +67,12 @@ sdk/templates/icon_hdpi.png platforms/${PLATFORM_NAME}/templates/icon_hdpi.png
# sdk.git files
# SDK properties
sdk/files/sdk.properties platforms/${PLATFORM_NAME}/sdk.properties
# legacy Ant build rules, copied under the old name
sdk/files/ant_rules_r1.xml platforms/${PLATFORM_NAME}/templates/android_rules.xml
sdk/files/ant_test_rules_r1.xml platforms/${PLATFORM_NAME}/templates/android_test_rules.xml
# newer Ant rules.
sdk/files/ant_rules_r3.xml platforms/${PLATFORM_NAME}/ant/ant_rules_r3.xml
sdk/files/ant_test_rules_r3.xml platforms/${PLATFORM_NAME}/ant/ant_test_rules_r3.xml
sdk/files/ant_lib_rules_r3.xml platforms/${PLATFORM_NAME}/ant/ant_lib_rules_r3.xml
sdk/files/ant_rules_r2.xml platforms/${PLATFORM_NAME}/ant/ant_rules_r2.xml
sdk/files/ant_test_rules_r2.xml platforms/${PLATFORM_NAME}/ant/ant_test_rules_r2.xml
sdk/files/ant_lib_rules_r2.xml platforms/${PLATFORM_NAME}/ant/ant_lib_rules_r2.xml
# copy the Ant rules to the platforms and to the tools.
sdk/files/ant platforms/${PLATFORM_NAME}/ant
sdk/files/ant tools/ant
# also copy the rev1 under the old name/location for legacy reason
sdk/files/ant/ant_rules_r1.xml platforms/${PLATFORM_NAME}/templates/android_rules.xml
sdk/files/ant/ant_test_rules_r1.xml platforms/${PLATFORM_NAME}/templates/android_test_rules.xml
# layout device definition
sdk/files/devices.xml tools/lib/devices.xml