Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90ef224f authored by Joe Onorato's avatar Joe Onorato Committed by Android Git Automerger
Browse files

am e2c62252: Merge "Instrumentation links against the jar file for its app, so... 

am e2c62252: Merge "Instrumentation links against the jar file for its app, so use that at the dependency." into gingerbread

Merge commit 'e2c62252' into gingerbread-plus-aosp

* commit 'e2c62252':
  Instrumentation links against the jar file for its app, so use that at the dependency.
parents 84843e68 e2c62252

core/base_rules.mk

+1 −4
Original line number Diff line number Diff line
@@ -381,10 +381,7 @@ ifdef LOCAL_INSTRUMENTATION_FOR 


  # link against the jar with full original names (before proguard processing).

  full_java_libs += $(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

  full_java_lib_deps += $(link_instr_intermediates_dir.COMMON)/classes-full-names.jar

endif



ifneq ($(strip $(LOCAL_JAR_MANIFEST)),)