From 73c10bed93b7749abb6cc268d0af2abfc35e0dc6 Mon Sep 17 00:00:00 2001 From: Guang Zhu Date: Thu, 24 Aug 2017 16:10:44 -0700 Subject: [PATCH] add CTS tradefed harness dependencies to PDK fusion config Bug: 38448863 Test: make platform-java, config zip contains added directories Change-Id: I49627ff9eac5effecb577b3d93ee0e24b3b4ab83 --- core/pdk_config.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/pdk_config.mk b/core/pdk_config.mk index 92ba8b781..e12be29ed 100644 --- a/core/pdk_config.mk +++ b/core/pdk_config.mk @@ -1,7 +1,10 @@ # This file defines the rule to fuse the platform.zip into the current PDK build. PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR := PDK_PLATFORM_JAVA_ZIP_JAVA_HOST_LIB_DIR := \ - host/common/obj/JAVA_LIBRARIES/bouncycastle-host_intermediates + host/common/obj/JAVA_LIBRARIES/bouncycastle-host_intermediates \ + host/common/obj/JAVA_LIBRARIES/compatibility-host-util_intermediates \ + host/common/obj/JAVA_LIBRARIES/cts-tradefed-harness_intermediates \ + host/common/obj/JAVA_LIBRARIES/hosttestlib_intermediates PDK_PLATFORM_JAVA_ZIP_CONTENTS := ifneq (,$(filter platform-java, $(MAKECMDGOALS))$(PDK_FUSION_PLATFORM_ZIP))