From b674a5226abcfc70a82feccd5e48700647dd8df2 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Sun, 6 May 2018 07:53:02 +0900 Subject: Prevent index out of range I3487634f1ec5bb3b5b60d636b64461d391add35a is causing build breakages in unbundled builds. The stubs libs are disabled for unbundled builds, and thus we shouldn't declare them as dist artifacts. Bug: 605033 Test: make -j dist ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk Change-Id: I3cd92e2cc6aeb48baf47d37780d8df2aa4756438 --- java/sdk_library.go | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'java/sdk_library.go') diff --git a/java/sdk_library.go b/java/sdk_library.go index 64bbb8b6..ee6998c3 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -164,15 +164,21 @@ func (module *sdkLibrary) AndroidMk() android.AndroidMkData { fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES := "+module.implName()) fmt.Fprintln(w, "include $(BUILD_PHONY_PACKAGE)") // Create dist rules to install the stubs libs to the dist dir - fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+ - module.publicApiStubsPath.Strings()[0]+ - ":"+path.Join("apistubs", "public", module.BaseModuleName()+".jar")+")") - fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+ - module.systemApiStubsPath.Strings()[0]+ - ":"+path.Join("apistubs", "system", module.BaseModuleName()+".jar")+")") - fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+ - module.testApiStubsPath.Strings()[0]+ - ":"+path.Join("apistubs", "test", module.BaseModuleName()+".jar")+")") + if len(module.publicApiStubsPath) == 1 { + fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+ + module.publicApiStubsPath.Strings()[0]+ + ":"+path.Join("apistubs", "public", module.BaseModuleName()+".jar")+")") + } + if len(module.systemApiStubsPath) == 1 { + fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+ + module.systemApiStubsPath.Strings()[0]+ + ":"+path.Join("apistubs", "system", module.BaseModuleName()+".jar")+")") + } + if len(module.testApiStubsPath) == 1 { + fmt.Fprintln(w, "$(call dist-for-goals,sdk win_sdk,"+ + module.testApiStubsPath.Strings()[0]+ + ":"+path.Join("apistubs", "test", module.BaseModuleName()+".jar")+")") + } }, } } -- cgit v1.2.3