diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:13:45 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:13:45 -0800 |
| commit | 0a521f6d93206567c14bbacdc13819bf4baf82d3 (patch) | |
| tree | 2e11b47c9856368387b394b6831726f2526bf6dd /build | |
| parent | 171957c0bdc547ae6013daddffc03c8ec3ac2e3e (diff) | |
| parent | adce814038b96c87ea66fc1e5bfd85ab28d80590 (diff) | |
| download | android_development-0a521f6d93206567c14bbacdc13819bf4baf82d3.tar.gz android_development-0a521f6d93206567c14bbacdc13819bf4baf82d3.tar.bz2 android_development-0a521f6d93206567c14bbacdc13819bf4baf82d3.zip | |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/development into cm-13.0staging/cm-13.0+r22stable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2K
Android 6.0.1 release 22
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.mk | 4 | ||||
| -rw-r--r-- | build/sdk.atree | 16 |
2 files changed, 20 insertions, 0 deletions
diff --git a/build/Android.mk b/build/Android.mk index b6445a0d7..ae6ae1f42 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -111,13 +111,17 @@ ANDROID_SUPPORT_LIBRARIES := \ android-support-v7-gridlayout \ android-support-v7-mediarouter \ android-support-v7-palette \ + android-support-v7-preference \ android-support-v7-recyclerview \ android-support-v13 \ + android-support-v14-preference \ android-support-v17-leanback \ + android-support-v17-preference-leanback \ android-support-multidex \ android-support-multidex-instrumentation \ android-support-design \ android-support-percent \ + android-support-recommendation \ android-support-customtabs $(foreach lib, $(ANDROID_SUPPORT_LIBRARIES), $(eval $(call _package_sdk_library,$(lib)))) diff --git a/build/sdk.atree b/build/sdk.atree index ee1e25132..b302a5868 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -521,6 +521,22 @@ ${OUT_DIR}/target/common/obj/PACKAGING/android-support-percent_intermediates/and 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 ############################################################################## |