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

resolved conflicts for merge of fab9a1f2 to mnc-dr-dev-plus-aosp

Browse Source 
Change-Id: I5cd69798c3880b835cdebf45dcaf90a8b26a1d4d
This commit is contained in:
Tony Mantler
2015-08-28 15:56:49 -07:00
parent 0c5f4b63b9 fab9a1f267
commit 013441f296
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/Android.mk
View File

@@ -111,13 +111,17 @@ ANDROID_SUPPORT_LIBRARIES := \
android-support-v7-gridlayout \ android-support-v7-gridlayout \
android-support-v7-mediarouter \ android-support-v7-mediarouter \
android-support-v7-palette \ android-support-v7-palette \
android-support-v7-preference \
android-support-v7-recyclerview \ android-support-v7-recyclerview \
android-support-v13 \ android-support-v13 \
android-support-v14-preference \
android-support-v17-leanback \ android-support-v17-leanback \
android-support-v17-preference-leanback \
android-support-multidex \ android-support-multidex \
android-support-multidex-instrumentation \ android-support-multidex-instrumentation \
android-support-design \ android-support-design \
android-support-percent \ android-support-percent \
android-support-recommendation \
android-support-customtabs android-support-customtabs
$(foreach lib, $(ANDROID_SUPPORT_LIBRARIES), $(eval $(call _package_sdk_library,$(lib)))) $(foreach lib, $(ANDROID_SUPPORT_LIBRARIES), $(eval $(call _package_sdk_library,$(lib))))

18
build/sdk.atree
View File

@@ -519,6 +519,24 @@ frameworks/support/percent/res
frameworks/support/percent/src/.readme extras/android/support/percent/src/.readme frameworks/support/percent/src/.readme extras/android/support/percent/src/.readme
${OUT_DIR}/target/common/obj/PACKAGING/android-support-percent_intermediates/android-support-percent.jar extras/android/support/percent/libs/android-support-percent.jar ${OUT_DIR}/target/common/obj/PACKAGING/android-support-percent_intermediates/android-support-percent.jar extras/android/support/percent/libs/android-support-percent.jar
frameworks/support/customtabs/AndroidManifest.xml extras/android/support/customtabs/AndroidManifest.xml
${OUT_DIR}/target/common/obj/PACKAGING/android-support-customtabs_intermediates/android-support-customtabs.jar extras/android/support/customtabs/libs/android-support-customtabs.jar
frameworks/support/v7/preference/AndroidManifest.xml extras/android/support/v7/preference/AndroidManifest.xml
frameworks/support/v7/preference/res extras/android/support/v7/preference/res
${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-preference_intermediates/android-support-v7-preference.jar extras/android.support/v7/preference/libs/android-support-v7-preference.jar
frameworks/support/v14/preference/AndroidManifest.xml extras/android/support/v14/preference/AndroidManifest.xml
frameworks/support/v14/preference/res extras/android/support/v14/preference/res
${OUT_DIR}/target/common/obj/PACKAGING/android-support-v14-preference_intermediates/android-support-v14-preference.jar extras/android.support/v14/preference/libs/android-support-v14-preference.jar
frameworks/support/v17/preference-leanback/AndroidManifest.xml extras/android/support/v17/preference-leanback/AndroidManifest.xml
frameworks/support/v17/preference-leanback/res extras/android/support/v17/preference-leanback/res
${OUT_DIR}/target/common/obj/PACKAGING/android-support-v17-preference-leanback_intermediates/android-support-v17-preference-leanback.jar extras/android.support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar
frameworks/support/recommendation/AndroidManifest.xml extras/android/support/recommendation/AndroidManifest.xml
${OUT_DIR}/target/common/obj/PACKAGING/android-support-recommendation_intermediates/android-support-recommendation.jar extras/android.support/recommendation/libs/android-support-recommendation.jar
############################################################################## ##############################################################################
# Tests Component # Tests Component
############################################################################## ##############################################################################