Instrumentation links against the jar file for its app, so use that at the dependency.
I don't remember exactly, but I think the dependencies for apps were broken, and you couldn't reliably cause the java to be rebuilt by depending just on the jar file-- you needed to depend on the apk. That isn't the case anymore, and relying on the apk means that something built in out/target/common was depending on something that's deleted by installclean. With this change (and others), on my mac, the build after installclean for passion-eng takes 2 minutes instead of 11. Change-Id: Ib490f88292d591254013e07958961fc50ec2e3dc
This commit is contained in:
parent
b751053151
commit
14d9515363
|
@ -381,10 +381,7 @@ ifdef LOCAL_INSTRUMENTATION_FOR
|
||||||
|
|
||||||
# link against the jar with full original names (before proguard processing).
|
# link against the jar with full original names (before proguard processing).
|
||||||
full_java_libs += $(link_instr_intermediates_dir.COMMON)/classes-full-names.jar
|
full_java_libs += $(link_instr_intermediates_dir.COMMON)/classes-full-names.jar
|
||||||
|
full_java_lib_deps += $(link_instr_intermediates_dir.COMMON)/classes-full-names.jar
|
||||||
# We can't depend on the .jar file, so we depend on something that
|
|
||||||
# depends on the jar file; the final built package file.
|
|
||||||
full_java_lib_deps += $(link_instr_intermediates_dir)/package.apk
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(strip $(LOCAL_JAR_MANIFEST)),)
|
ifneq ($(strip $(LOCAL_JAR_MANIFEST)),)
|
||||||
|
|
Loading…
Reference in New Issue