From ac5027264c1080e4285ca8d4db702b35c01917fd Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 21 Nov 2018 20:33:56 -0800 Subject: [PATCH] Dist the javac-compiled stubs jars The header jars are compiled with turbine, which produces a jar that is less compliant to the class file spec than when compiled with javac. Since the dist'ed jars may be shipped with the SDK, use the javac version for maximum compatibility. Bug: 119841341 Test: forrest SDK build Change-Id: I745c8dd0305d95ae9ce025a9c23e51a99ebb0a3b --- java/sdk_library.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/sdk_library.go b/java/sdk_library.go index e513a59aa..573fc8ef5 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -229,19 +229,19 @@ func (module *sdkLibrary) AndroidMk() android.AndroidMkData { // Create dist rules to install the stubs libs to the dist dir if len(module.publicApiStubsPath) == 1 { fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+ - module.publicApiStubsPath.Strings()[0]+ + module.publicApiStubsImplPath.Strings()[0]+ ":"+path.Join("apistubs", owner, "public", module.BaseModuleName()+".jar")+")") } if len(module.systemApiStubsPath) == 1 { fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+ - module.systemApiStubsPath.Strings()[0]+ + module.systemApiStubsImplPath.Strings()[0]+ ":"+path.Join("apistubs", owner, "system", module.BaseModuleName()+".jar")+")") } if len(module.testApiStubsPath) == 1 { fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+ - module.testApiStubsPath.Strings()[0]+ + module.testApiStubsImplPath.Strings()[0]+ ":"+path.Join("apistubs", owner, "test", module.BaseModuleName()+".jar")+")") }