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

Merge "Add android-support-v4.jar to sdk."

Browse Source
This commit is contained in:
Ying Wang
2011-03-02 21:22:59 -08:00
committed by Android (Google) Code Review
parent f57cc7f77b d46eaa6f76
commit f566bf1d88
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build/Android.mk
View File

@@ -64,3 +64,14 @@ $(android_jar_full_target): $(full_target)
$(hide)$(ACP) $< $@ $(hide)$(ACP) $< $@
ALL_SDK_FILES += $(android_jar_full_target) ALL_SDK_FILES += $(android_jar_full_target)
android-support-v4_build_module := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android-support-v4_intermediates/javalib.jar
android-support-v4_intermediates := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/android-support-v4_intermediates
android-support-v4_full_target := $(android-support-v4_intermediates)/android-support-v4.jar
$(android-support-v4_full_target): $(android-support-v4_build_module)
@echo Package android-support-v4.jar: $@
$(hide)mkdir -p $(dir $@)
$(hide)$(ACP) $< $@
ALL_SDK_FILES += $(android-support-v4_full_target)

12
build/sdk.atree
View File

@@ -145,7 +145,7 @@ frameworks/base/docs/docs-samples-redirect.html docs/samples/index.html
# samples to include in the sdk samples package # samples to include in the sdk samples package
# #
# the list here should match the list of samples that we generate docs for, # the list here should match the list of samples that we generate docs for,
# (see web_docs_sample_code_flags in frameworks/base/Android.mk) # (see web_docs_sample_code_flags in frameworks/base/Android.mk)
development/apps/GestureBuilder samples/${PLATFORM_NAME}/GestureBuilder development/apps/GestureBuilder samples/${PLATFORM_NAME}/GestureBuilder
development/samples/source.properties samples/${PLATFORM_NAME}/source.properties development/samples/source.properties samples/${PLATFORM_NAME}/source.properties
@@ -203,8 +203,8 @@ sdk/files/README_add-ons.txt add-ons/README.txt
# Extra Component: Compatibility # Extra Component: Compatibility
############################################################################## ##############################################################################
development/sdk/compatibility_source.properties extras/android/compatibility/source.properties development/sdk/compatibility_source.properties extras/android/compatibility/source.properties
development/sdk/compatibility_README.txt extras/android/compatibility/README.txt development/sdk/compatibility_README.txt extras/android/compatibility/README.txt
#${DIST_DIR}/android-support-v4.jar extras/android/compatibility/v4/android-support-v4.jar ${OUT_DIR}/target/common/obj/PACKAGING/android-support-v4_intermediates/android-support-v4.jar extras/android/compatibility/v4/android-support-v4.jar
frameworks/support/v4 extras/android/compatibility/v4/src frameworks/support/v4 extras/android/compatibility/v4/src
development/samples/ApiDemos extras/android/compatibility/v4/samples/ApiDemos development/samples/ApiDemos extras/android/compatibility/v4/samples/ApiDemos