commit 8c254825a062fd240566404d9d6ecc7cc56b30ba
author Ying Wang <wangying@google.com> Tue Mar 16 16:13:56 2010 -0700
committer Ying Wang <wangying@google.com> Tue Mar 16 17:08:58 2010 -0700
tree d03c654200c113392cff8128607bac682554a193
parent 283e2a1e1bae4e21824969a15da6420204633ddd

Support to override instr target package in inherit-package

http://b/issue?id=2451361
With this CL, you can inherit a testing package to test a inheriting package.
Note: we change the meaning of $(5), so we need to change any existing calls
to inherit-package in other projects.

Change-Id: I673155d1b8b6006953d14e1ab87066536ebd1e54

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index c4e19b4..0ad797a 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -411,6 +411,7 @@
 $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_AAPT_FLAGS:= $(LOCAL_AAPT_FLAGS)
 $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_JAVA_LIBRARIES:= $(LOCAL_JAVA_LIBRARIES)
 $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_MANIFEST_PACKAGE_NAME:= $(LOCAL_MANIFEST_PACKAGE_NAME)
+$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_INSTRUMENTATION_FOR_PACKAGE_NAME:= $(LOCAL_INSTRUMENTATION_FOR_PACKAGE_NAME)
 
 $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_ALL_JAVA_LIBRARIES:= $(full_java_libs)
 $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_IS_HOST_MODULE := $(LOCAL_IS_HOST_MODULE)