summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Gaillard <jgaillard@google.com>2019-10-10 19:25:42 +0100
committerJerome Gaillard <jgaillard@google.com>2019-11-18 10:39:40 +0000
commit404f66903c4a52c0f68ad5f4c04c196e479a8cfb (patch)
treeb2efe28e8928ada64e07545becf349f6fa2d161d
parent5f7d9e20e75d2eaa6480c42bb7945df013e24bdf (diff)
downloadandroid_development-404f66903c4a52c0f68ad5f4c04c196e479a8cfb.tar.gz
android_development-404f66903c4a52c0f68ad5f4c04c196e479a8cfb.tar.bz2
android_development-404f66903c4a52c0f68ad5f4c04c196e479a8cfb.zip
Some files for the SDK are now built in a different place
This updates the origin location of some files because they are now generated in a different way and so end up in a different folder. Bug: 142480924 Test: m sdk Change-Id: I2dafafc113e7e5c77d469b69b7fe9f25cc0555b1 Merged-In: I2dafafc113e7e5c77d469b69b7fe9f25cc0555b1
-rw-r--r--build/sdk.atree12
1 files changed, 6 insertions, 6 deletions
diff --git a/build/sdk.atree b/build/sdk.atree
index e637e8f1b..e42781704 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -219,12 +219,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