diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.mk | 23 | ||||
| -rw-r--r-- | build/sdk.atree | 19 | ||||
| -rw-r--r-- | build/sdk.exclude.atree | 3 | ||||
| -rwxr-xr-x | build/tools/mk_sources_zip.py | 2 |
4 files changed, 30 insertions, 17 deletions
diff --git a/build/Android.mk b/build/Android.mk index 8fbab3b45..0954581b9 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -121,12 +121,21 @@ $(eval _psm_packaging_target :=) endef ANDROID_SUPPORT_LIBRARIES := \ + android-support-animatedvectordrawable \ android-support-annotations \ android-support-compat \ - android-support-media-compat \ android-support-core-ui \ - android-support-fragment \ android-support-core-utils \ + android-support-customtabs \ + android-support-design \ + android-support-documents-archive \ + android-support-fragment \ + android-support-media-compat \ + android-support-multidex \ + android-support-multidex-instrumentation \ + android-support-percent \ + android-support-recommendation \ + android-support-transition \ android-support-v4 \ android-support-v7-appcompat \ android-support-v7-cardview \ @@ -139,15 +148,7 @@ ANDROID_SUPPORT_LIBRARIES := \ 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 \ - android-support-documents-archive \ - android-support-vectordrawable \ - android-support-animatedvectordrawable + android-support-vectordrawable $(foreach lib, $(ANDROID_SUPPORT_LIBRARIES), $(eval $(call _package_sdk_library,$(lib)))) diff --git a/build/sdk.atree b/build/sdk.atree index a9c215870..093bd3a38 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -57,11 +57,11 @@ development/sdk/generated-api-versions.xml platform-tools/api/api-versions.xm prebuilts/sdk/sdk-annotations/annotations.zip platform-tools/api/annotations.zip # systrace -external/chromium-trace/catapult/systrace/systrace/ platform-tools/systrace/catapult/systrace/systrace/ -external/chromium-trace/catapult/systrace/systrace/__init__.py platform-tools/systrace/catapult/systrace/systrace/__init__.py -external/chromium-trace/catapult/systrace/systrace/agents/__init__.py platform-tools/systrace/catapult/systrace/systrace/agents/__init__.py +external/chromium-trace/catapult/common/ platform-tools/systrace/catapult/common/ +external/chromium-trace/catapult/dependency_manager/ platform-tools/systrace/catapult/dependency_manager/ +external/chromium-trace/catapult/devil/ platform-tools/systrace/catapult/devil/ +external/chromium-trace/catapult/systrace/ platform-tools/systrace/catapult/systrace/ external/chromium-trace/systrace.py platform-tools/systrace/systrace.py -external/chromium-trace/systrace_trace_viewer.html platform-tools/systrace/systrace_trace_viewer.html external/chromium-trace/NOTICE platform-tools/systrace/NOTICE external/chromium-trace/UPSTREAM_REVISION platform-tools/systrace/UPSTREAM_REVISION @@ -351,6 +351,9 @@ developers/build/prebuilts/gradle/DirectShare sam developers/build/prebuilts/gradle/MidiScope samples/${PLATFORM_NAME}/media/MidiScope developers/build/prebuilts/gradle/MidiSynth samples/${PLATFORM_NAME}/media/MidiSynth developers/build/prebuilts/gradle/AsymmetricFingerprintDialog samples/${PLATFORM_NAME}/security/AsymmetricFingerprintDialog +developers/build/prebuilts/gradle/AppShortcuts samples/${PLATFORM_NAME}/system/AppShortcuts +developers/build/prebuilts/gradle/CommitContentSampleApp samples/${PLATFORM_NAME}/input/keyboard/CommitContentSampleApp +developers/build/prebuilts/gradle/CommitContentSampleIME samples/${PLATFORM_NAME}/input/keyboard/CommitContentSampleIME developers/build/prebuilts/androidtv samples/${PLATFORM_NAME}/androidtv @@ -374,6 +377,7 @@ developers/build/prebuilts/gradle/SynchronizedNotifications samples/${PLATFO developers/build/prebuilts/gradle/Timer samples/${PLATFORM_NAME}/wearable/Timer developers/build/prebuilts/gradle/WatchFace samples/${PLATFORM_NAME}/wearable/WatchFace developers/build/prebuilts/gradle/WatchViewStub samples/${PLATFORM_NAME}/wearable/WatchViewStub +developers/build/prebuilts/gradle/WearNotifications samples/${PLATFORM_NAME}/wearable/WearNotifications developers/build/prebuilts/gradle/WearSpeakerSample samples/${PLATFORM_NAME}/wearable/WearSpeakerSample developers/build/prebuilts/gradle/XYZTouristAttractions samples/${PLATFORM_NAME}/wearable/XYZTouristAttractions @@ -571,6 +575,13 @@ ${OUT_DIR}/target/common/obj/PACKAGING/android-support-vectordrawable_intermedia ${OUT_DIR}/target/common/obj/PACKAGING/android-support-animatedvectordrawable_intermediates/android-support-animatedvectordrawable.jar extras/android/support/graphics/drawable/libs/android-support-animatedvectordrawable.jar +frameworks/support/transition/AndroidManifest.xml extras/android/support/transition/AndroidManifest.xml +frameworks/support/transition/res extras/android/support/transition/res +${OUT_DIR}/target/common/obj/PACKAGING/android-support-transition_intermediates/android-support-transition.jar extras/android/support/transition/libs/android-support-transition.jar + +frameworks/support/documents-archive/AndroidManifest.xml extras/android/support/documents-archive/AndroidManifest.xml +${OUT_DIR}/target/common/obj/PACKAGING/android-support-documents-archive_intermediates/android-support-documents-archive.jar extras/android/support/documents-archive/libs/android-support-documents-archive.jar + ############################################################################## # Tests Component ############################################################################## diff --git a/build/sdk.exclude.atree b/build/sdk.exclude.atree index 5a93b1b6e..479d79c39 100644 --- a/build/sdk.exclude.atree +++ b/build/sdk.exclude.atree @@ -20,7 +20,8 @@ -.*.swp -.DS_Store -*~ --_* +-_[!_]* +-*.pyc -.* -OWNERS -MODULE_LICENSE_* diff --git a/build/tools/mk_sources_zip.py b/build/tools/mk_sources_zip.py index 3220e3a7d..09cfed187 100755 --- a/build/tools/mk_sources_zip.py +++ b/build/tools/mk_sources_zip.py @@ -39,7 +39,7 @@ class Params(object): self.CNT_NOPKG = 0 # DIR is the list of directories to scan in TOPDIR. self.DIR = "frameworks libcore" - self.IGNORE_DIR = [ "hosttests", "tools", "tests" ] + self.IGNORE_DIR = [ "hosttests", "tools", "tests", "samples" ] # IGNORE is a list of namespaces to ignore. Must be java # package definitions (e.g. "com.blah.foo.") self.IGNORE = [ "sun.", "libcore.", "dalvik.", |