diff options
| author | Jiyong Park <jiyong@google.com> | 2018-03-23 21:02:38 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2018-03-24 15:12:37 +0900 |
| commit | 924d35b926d03d6358bf16de1e92e9b42a0c24f1 (patch) | |
| tree | 6cd82d3978311a3beb2fbdb661b02eb75dc8b83b /java | |
| parent | 8e10408ccf763ac6a2594d03d9474983b82bc78f (diff) | |
| download | build_soong-924d35b926d03d6358bf16de1e92e9b42a0c24f1.tar.gz build_soong-924d35b926d03d6358bf16de1e92e9b42a0c24f1.tar.bz2 build_soong-924d35b926d03d6358bf16de1e92e9b42a0c24f1.zip | |
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)
Diffstat (limited to 'java')
| -rw-r--r-- | java/java.go | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/java/java.go b/java/java.go index 125fde1e..3feb8382 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()...) |