Merge "Some files for the SDK are now built in a different place" am: 2e9d2a0112 am: 085de0e20f

am: 11d3bb7fb7

Change-Id: Ia4ac454ed443c2a3e4357d8f098f669ac92d1240
This commit is contained in:
Jerome Gaillard
2019-10-21 05:08:54 -07:00
committed by android-build-merger

View File

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