commit a059c71348fbd21264e510e995c125f36473c3c0
author Sundong Ahn <sundongahn@google.com> Mon Jun 04 14:14:18 2018 +0900
committer Sundong Ahn <sundongahn@google.com> Tue Jun 19 10:02:25 2018 +0900
tree 46b83a49527c441b799a0f3225f14fd5b58e3a17
parent eb0a09acf3d55ab497e86c1e96bc7d64b8c6425e

Support java sdk libraries

Sdk addon has been allowed for libraries built with Android.mk. But some
of the libraries included in the Sdk addon should be built with
java_sdk_library. module-stubs-files function is modified for supporting
java_sdk_library modules.

Bug:77577799
Test: make -j
Change-Id: If289e5aa5b5016901ff9b69da8fc7f7d8138a456

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 9c7f8b6..845daa5 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -657,7 +657,8 @@
 ###########################################################
 
 define module-stubs-files
-$(foreach module,$(1),$(ALL_MODULES.$(module).STUBS))
+$(foreach module,$(1),$(if $(filter $(module),$(JAVA_SDK_LIBRARIES)),\
+$(call java-lib-files,$(module).stubs),$(ALL_MODULES.$(module).STUBS)))
 endef
 
 ###########################################################