am ca15c415: Merge "Add tzdata to SDK build" into lmp-dev

* commit 'ca15c4153285d2eb587b0d026c47f57ff36d2fe1':
  Add tzdata to SDK build
This commit is contained in:
Deepanshu Gupta
2014-12-03 20:58:16 +00:00
committed by Android Git Automerger

View File

@@ -183,6 +183,9 @@ docs/features.txt platforms/${PLATFORM_NAME}/data/featur
# fonts for layoutlib. # fonts for layoutlib.
${FONT_OUT} platforms/${PLATFORM_NAME}/data/fonts ${FONT_OUT} platforms/${PLATFORM_NAME}/data/fonts
# timezone data for layoutlib
bionic/libc/zoneinfo/tzdata platforms/${PLATFORM_NAME}/data/tzdata
# NOTICE files are copied by build/core/Makefile from sdk.git # NOTICE files are copied by build/core/Makefile from sdk.git
development/sdk/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/templates/NOTICE.txt development/sdk/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/templates/NOTICE.txt
development/sdk/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/data/NOTICE.txt development/sdk/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/data/NOTICE.txt