From 924d35b926d03d6358bf16de1e92e9b42a0c24f1 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 23 Mar 2018 21:02:38 +0900 Subject: [PATCH] Handle prebuiltDepTag for java modules When there is a prebuilt java lib defined and there is a java library with the same name, the reverse dependency from the java lib to the prebuilt lib is added. However, the java library didn't recognize the dependency type and causes error. Fixing the problem by not panicking on such dependency. Test: m -j Test: m -j dist DIST_DIR=out/dist ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk Merged-In: I79673b2bb382100e42c5336e8041daa8c86fa857 Change-Id: I79673b2bb382100e42c5336e8041daa8c86fa857 (cherry picked from commit 46dbf9c63e3daa0712aa81b7810c732b38daed3d) --- java/java.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/java/java.go b/java/java.go index 125fde1ec..3feb83828 100644 --- a/java/java.go +++ b/java/java.go @@ -19,7 +19,6 @@ package java // is handled in builder.go import ( - "fmt" "path/filepath" "strconv" "strings" @@ -646,8 +645,6 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { } case kotlinStdlibTag: deps.kotlinStdlib = dep.HeaderJars() - default: - panic(fmt.Errorf("unknown dependency %q for %q", otherName, ctx.ModuleName())) } deps.aidlIncludeDirs = append(deps.aidlIncludeDirs, dep.AidlIncludeDirs()...)