Merge "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from offline-sdk" am: a574d1c922

am: 2c300ea015

Change-Id: I61b2ab356cf8ad51d275b91fb421cd8d8159a8c4
This commit is contained in:
Nan Zhang
2018-07-30 13:54:55 -07:00
committed by android-build-merger

View File

@@ -211,12 +211,12 @@ ${OUT_DIR}/target/common/obj/PACKAGING/metalava-api-stubs-docs_annotations.zip p
# Eclipse Editors support # Eclipse Editors support
framework/layoutlib-legacy.jar platforms/${PLATFORM_NAME}/data/layoutlib.jar framework/layoutlib-legacy.jar platforms/${PLATFORM_NAME}/data/layoutlib.jar
frameworks/base/core/res/res platforms/${PLATFORM_NAME}/data/res frameworks/base/core/res/res platforms/${PLATFORM_NAME}/data/res
docs/activity_actions.txt platforms/${PLATFORM_NAME}/data/activity_actions.txt docs/offline-sdk/activity_actions.txt platforms/${PLATFORM_NAME}/data/activity_actions.txt
docs/broadcast_actions.txt platforms/${PLATFORM_NAME}/data/broadcast_actions.txt docs/offline-sdk/broadcast_actions.txt platforms/${PLATFORM_NAME}/data/broadcast_actions.txt
docs/service_actions.txt platforms/${PLATFORM_NAME}/data/service_actions.txt docs/offline-sdk/service_actions.txt platforms/${PLATFORM_NAME}/data/service_actions.txt
docs/categories.txt platforms/${PLATFORM_NAME}/data/categories.txt docs/offline-sdk/categories.txt platforms/${PLATFORM_NAME}/data/categories.txt
docs/widgets.txt platforms/${PLATFORM_NAME}/data/widgets.txt docs/offline-sdk/widgets.txt platforms/${PLATFORM_NAME}/data/widgets.txt
docs/features.txt platforms/${PLATFORM_NAME}/data/features.txt docs/offline-sdk/features.txt platforms/${PLATFORM_NAME}/data/features.txt
# fonts for layoutlib. # fonts for layoutlib.
${FONT_OUT} platforms/${PLATFORM_NAME}/data/fonts ${FONT_OUT} platforms/${PLATFORM_NAME}/data/fonts