LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 4dedff68: SDK: generate system-image.zip in sdk_repo

Browse Source 
* commit '4dedff68c253a65d34cec63fe6f24b8d275bf850':
  SDK: generate system-image.zip in sdk_repo
This commit is contained in:
Raphael Moll
2011-09-28 12:54:26 -07:00
committed by Android Git Automerger
parent b8b0bacb8c 4dedff68c2
commit d4566c69b3
6 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/tools/mk_sdk_repo_xml.sh
View File

@@ -6,7 +6,7 @@ set -e
PROG_DIR=$(dirname $0)
TYPES="tool platform-tool platform sample doc add-on"
TYPES="tool platform-tool platform sample doc add-on system-image"
OSES="linux macosx windows any linux-x86 darwin"
TMP_DIR=$(mktemp -d -t sdkrepo.tmp.XXXXXXXX)
@@ -151,7 +151,7 @@ function output_attributes() {
while [[ -n "$1" ]]; do
# Process archives.
# First we expect a type. For conveniency the type can be plural.
# First we expect a type. For convenience the type can be plural.
TYPE=$(check_enum "${1%%s}" $TYPES)
[[ -z $TYPE ]] && error "Unknown archive type '$1'."
shift

4
build/tools/sdk_repo.mk
View File

@@ -67,7 +67,7 @@ $(eval $(call mk-sdk-repo-pkg-1,windows,$(WIN_SDK_ZIP),tools))
$(eval $(call mk-sdk-repo-pkg-1,windows,$(WIN_SDK_ZIP),platform-tools))
SDK_REPO_DEPS += \
$(call sdk-repo-pkg-zip,windows,$(WIN_SDK_ZIP),tools) \
$(call sdk-repo-pkg-zip,windows,$(WIN_SDK_ZIP),tools) \
$(call sdk-repo-pkg-zip,windows,$(WIN_SDK_ZIP),platform-tools)
endif
@@ -82,6 +82,7 @@ $(eval $(call mk-sdk-repo-pkg-1,$(HOST_OS),$(MAIN_SDK_ZIP),platform-tools))
$(eval $(call mk-sdk-repo-pkg-1,$(HOST_OS),$(MAIN_SDK_ZIP),docs))
$(eval $(call mk-sdk-repo-pkg-2,$(HOST_OS),$(MAIN_SDK_ZIP),platforms))
$(eval $(call mk-sdk-repo-pkg-2,$(HOST_OS),$(MAIN_SDK_ZIP),samples))
$(eval $(call mk-sdk-repo-pkg-2,$(HOST_OS),$(MAIN_SDK_ZIP),system-images))
SDK_REPO_DEPS += \
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),tools) \
@@ -89,6 +90,7 @@ SDK_REPO_DEPS += \
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),docs) \
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),platforms) \
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),samples) \
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),system-images)
endif

3
sdk/images_armeabi-v7a_source.properties
View File

@@ -1,7 +1,6 @@
Pkg.Desc=Android SDK Platform 4.0
Pkg.UserSrc=false
Platform.Version=4.0
Pkg.Revision=1
AndroidVersion.ApiLevel=14
SystemImage.Abi=armeabi-v7a
#AndroidVersion.CodeName=
SystemImage.Abi=armeabi-v7a

3
sdk/images_armeabi_source.properties
View File

@@ -1,7 +1,6 @@
Pkg.Desc=Android SDK Platform 4.0
Pkg.UserSrc=false
Platform.Version=4.0
Pkg.Revision=1
AndroidVersion.ApiLevel=14
SystemImage.Abi=armeabi
#AndroidVersion.CodeName=
SystemImage.Abi=armeabi

3
sdk/images_x86_source.properties
View File

@@ -1,7 +1,6 @@
Pkg.Desc=Android SDK Platform 4.0
Pkg.UserSrc=false
Platform.Version=4.0
Pkg.Revision=1
AndroidVersion.ApiLevel=14
SystemImage.Abi=x86
#AndroidVersion.CodeName=
SystemImage.Abi=x86

2
sdk/platform_source.properties
View File

@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK Platform 4.0
Pkg.UserSrc=false
Platform.IncludedAbi=armeabi
#Platform.IncludedAbi= #sys-img is not bundled in platform
Platform.Version=4.0
Pkg.Revision=1
Layoutlib.Api=4