commit 70b934ee64c1a90195ed03073e9048b9a2309242
author Dan Willemsen <dwillemsen@google.com> Thu Jun 13 16:50:22 2019 +0000
committer Dan Willemsen <dwillemsen@google.com> Tue Jun 18 01:19:04 2019 +0000
tree d078cc2c07cac5994c1e1cbbdb8baff9e73ca9d0
parent 58982618e11cbdd3dcb95b41a69d912e8ef1a704

Depend on all the files from system modules

Test: treehugger
Change-Id: Ie84dda3d05a84658ad9386a3034d861138f25b2c

core/java_common.mk

diff --git a/core/java_common.mk b/core/java_common.mk
index 9909885..ff2886e 100644
--- a/core/java_common.mk
+++ b/core/java_common.mk
@@ -416,8 +416,8 @@
       ifndef SOONG_SYSTEM_MODULES_$(my_system_modules)
         $(call pretty-error, Invalid system modules $(my_system_modules))
       endif
-      full_java_system_modules_deps := $(SOONG_SYSTEM_MODULES_$(my_system_modules))
-      my_system_modules_dir := $(patsubst %/lib/modules,%,$(SOONG_SYSTEM_MODULES_$(my_system_modules)))
+      full_java_system_modules_deps := $(SOONG_SYSTEM_MODULES_DEPS_$(my_system_modules))
+      my_system_modules_dir := $(SOONG_SYSTEM_MODULES_$(my_system_modules))
     endif
   endif
 endif