From a3aeb54513bffdc4290fa8c9cfa61eb47d93e7f9 Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Thu, 26 Jul 2018 11:25:01 -0700 Subject: [PATCH] Copy files related to sdk dev tool(activity_actions.txt, and etc.) from offline-sdk Originally these files were dumped to out/target/common/docs. However, three modules(offline-sdk, offline-sdk-referenceonly, and offline-system-sdk-referenceonly) generate these files with the same name which might cause the problem that these files got overwritten back and forth. Test: m -j out/target/common/docs/offline-sdk-timestamp Bug: b/70351683 Change-Id: I9badab5243f0d2a14bd55e561661483365b677c2 Merged-In: I9badab5243f0d2a14bd55e561661483365b677c2 --- build/sdk.atree | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/sdk.atree b/build/sdk.atree index 787571e3d..89855cb57 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -214,12 +214,12 @@ ${OUT_DIR}/target/common/obj/PACKAGING/metalava-api-stubs-docs_annotations.zip p # Eclipse Editors support framework/layoutlib-legacy.jar platforms/${PLATFORM_NAME}/data/layoutlib.jar frameworks/base/core/res/res platforms/${PLATFORM_NAME}/data/res -docs/activity_actions.txt platforms/${PLATFORM_NAME}/data/activity_actions.txt -docs/broadcast_actions.txt platforms/${PLATFORM_NAME}/data/broadcast_actions.txt -docs/service_actions.txt platforms/${PLATFORM_NAME}/data/service_actions.txt -docs/categories.txt platforms/${PLATFORM_NAME}/data/categories.txt -docs/widgets.txt platforms/${PLATFORM_NAME}/data/widgets.txt -docs/features.txt platforms/${PLATFORM_NAME}/data/features.txt +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 # fonts for layoutlib. ${FONT_OUT} platforms/${PLATFORM_NAME}/data/fonts