From 49d3a523bf8ca512ff414d780534464ab4b30b30 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Thu, 18 Jun 2020 21:09:55 +0100
Subject: [PATCH] Instrument the java_sdk_library implementation library

Bug: 159241638
Test: build jacoco-report-classes-all.jar with and without
      prebuilt for framework-tethering. Ensure it contains the
      jacoco-report-classes.jar for framework-tethering.
Change-Id: I8183bd9613dfaf0ded5f9ac36567d5d29a8941e8
Merged-In: I8183bd9613dfaf0ded5f9ac36567d5d29a8941e8
---
 java/sdk_library.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/java/sdk_library.go b/java/sdk_library.go
index f000af91e..c23ceb734 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -1091,9 +1091,12 @@ func (module *SdkLibrary) createImplLibrary(mctx android.DefaultableHookContext)
 	props := struct {
 		Name       *string
 		Visibility []string
+		Instrument bool
 	}{
 		Name:       proptools.StringPtr(module.implLibraryModuleName()),
 		Visibility: module.sdkLibraryProperties.Impl_library_visibility,
+		// Set the instrument property to ensure it is instrumented when instrumentation is required.
+		Instrument: true,
 	}
 
 	properties := []interface{}{