コミット: 3a92963bf3865330e89b3e7a66b66dd9cfc8792b - development (git)

development

コミットメタ情報

• リビジョン: 3a92963bf3865330e89b3e7a66b66dd9cfc8792b (tree)
• 日時: 2009-08-27 03:26:06
• 作者: Android (Google) Code Review <android-gerrit@goog...>
• コミッター: Android (Google) Code Review

ログメッセージ

Merge change 22652 into donut

* changes:

Cleanup SDK packaging: remove alias build files.

変更サマリ

• modified: build/sdk.atree
• modified: tools/scripts/AndroidManifest.alias.template
• modified: tools/scripts/alias.template
• modified: tools/scripts/alias_rules.xml
• modified: tools/scripts/build.alias.template

差分

--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -50,7 +50,6 @@ obj/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl
 
 # sdk scripts
 development/tools/scripts/AndroidManifest.template platforms/${PLATFORM_NAME}/templates/AndroidManifest.template
-development/tools/scripts/AndroidManifest.alias.template platforms/${PLATFORM_NAME}/templates/AndroidManifest.alias.template
 development/tools/scripts/AndroidManifest.tests.template platforms/${PLATFORM_NAME}/templates/AndroidManifest.tests.template
 development/tools/scripts/iml.template platforms/${PLATFORM_NAME}/templates/iml.template
 development/tools/scripts/ipr.template platforms/${PLATFORM_NAME}/templates/ipr.template
@@ -59,11 +58,8 @@ development/tools/scripts/java_file.template platforms/${PLATFORM_NAME}/template
 development/tools/scripts/java_tests_file.template platforms/${PLATFORM_NAME}/templates/java_tests_file.template
 development/tools/scripts/layout.template platforms/${PLATFORM_NAME}/templates/layout.template
 development/tools/scripts/strings.template platforms/${PLATFORM_NAME}/templates/strings.template
-development/tools/scripts/alias.template platforms/${PLATFORM_NAME}/templates/alias.template
 development/tools/scripts/android_rules.xml platforms/${PLATFORM_NAME}/templates/android_rules.xml
-development/tools/scripts/alias_rules.xml platforms/${PLATFORM_NAME}/templates/alias_rules.xml
 development/tools/scripts/build.template tools/lib/build.template
-development/tools/scripts/build.alias.template tools/lib/build.alias.template
 
 # emacs support
 development/tools/scripts/android.el tools/lib/android.el

--- a/tools/scripts/AndroidManifest.alias.template
+++ b/tools/scripts/AndroidManifest.alias.template
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+ALIAS PROJECTS ARE CURRENT NOT SUPPORTED.
+THIS FILE IS CURRENTLY BROKEN AND SHOULD NOT BE USED.
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="PACKAGE"
       android:versionCode="1"

--- a/tools/scripts/alias.template
+++ b/tools/scripts/alias.template
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+ALIAS PROJECTS ARE CURRENT NOT SUPPORTED.
+THIS FILE IS CURRENTLY BROKEN AND SHOULD NOT BE USED.
+-->
 <alias xmlns:android="http://schemas.android.com/apk/res/android">
     <intent android:action="android.intent.action.VIEW"
         android:data="ALIASDATA"/>

--- a/tools/scripts/alias_rules.xml
+++ b/tools/scripts/alias_rules.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ALIAS PROJECTS ARE CURRENT NOT SUPPORTED.
+THIS FILE IS CURRENTLY BROKEN AND SHOULD NOT BE USED.
+-->
 <project name="alias_rules" default="package">
 
     <!-- No user servicable parts below. -->

--- a/tools/scripts/build.alias.template
+++ b/tools/scripts/build.alias.template
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ALIAS PROJECTS ARE CURRENT NOT SUPPORTED.
+THIS FILE IS CURRENTLY BROKEN AND SHOULD NOT BE USED.
+-->
 <project name="PROJECT_NAME" default="package">
 
     <!-- The build.properties file can be created by you and is never touched