2015-08-29 02:47:03 +08:00
|
|
|
# Common to host and target Java modules.
|
|
|
|
|
|
2017-12-07 06:37:06 +08:00
|
|
|
my_soong_problems :=
|
|
|
|
|
|
|
|
|
|
ifneq ($(filter ../%,$(LOCAL_SRC_FILES)),)
|
|
|
|
|
my_soong_problems += dotdot_srcs
|
|
|
|
|
endif
|
|
|
|
|
|
2016-01-29 22:22:29 +08:00
|
|
|
###########################################################
|
|
|
|
|
## Java version
|
|
|
|
|
###########################################################
|
2016-03-05 02:00:00 +08:00
|
|
|
# Use the LOCAL_JAVA_LANGUAGE_VERSION if it is set, otherwise
|
|
|
|
|
# use one based on the LOCAL_SDK_VERSION. If it is < 24
|
|
|
|
|
# pass "1.7" to the tools, if it is unset, >= 24 or "current"
|
|
|
|
|
# pass "1.8".
|
|
|
|
|
#
|
|
|
|
|
# The LOCAL_SDK_VERSION behavior is to ensure that, by default,
|
|
|
|
|
# code that is expected to run on older releases of Android
|
|
|
|
|
# does not use any 1.8 language features that are not supported
|
|
|
|
|
# on earlier runtimes (like default / static interface methods).
|
|
|
|
|
# Modules can override this logic by specifying
|
|
|
|
|
# LOCAL_JAVA_LANGUAGE_VERSION explicitly.
|
2016-01-29 22:22:29 +08:00
|
|
|
ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION))
|
2017-10-13 04:34:40 +08:00
|
|
|
ifneq (,$(filter $(LOCAL_SDK_VERSION), $(TARGET_SDK_VERSIONS_WITHOUT_JAVA_18_SUPPORT)))
|
2016-02-29 20:07:00 +08:00
|
|
|
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
|
2017-10-13 04:34:40 +08:00
|
|
|
else ifneq (,$(filter $(LOCAL_SDK_VERSION), $(TARGET_SDK_VERSIONS_WITHOUT_JAVA_19_SUPPORT)))
|
|
|
|
|
LOCAL_JAVA_LANGUAGE_VERSION := 1.8
|
|
|
|
|
else ifneq (,$(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS))
|
|
|
|
|
# TODO(ccross): allow 1.9 for current and unbundled once we have SDK system modules
|
|
|
|
|
LOCAL_JAVA_LANGUAGE_VERSION := 1.8
|
2016-03-05 02:00:00 +08:00
|
|
|
else
|
2017-11-16 04:55:03 +08:00
|
|
|
# DEFAULT_JAVA_LANGUAGE_VERSION is 1.8, unless TARGET_OPENJDK9 in which case it is 1.9
|
2017-10-13 04:34:40 +08:00
|
|
|
LOCAL_JAVA_LANGUAGE_VERSION := $(DEFAULT_JAVA_LANGUAGE_VERSION)
|
2016-02-29 20:07:00 +08:00
|
|
|
endif
|
2016-01-29 22:22:29 +08:00
|
|
|
endif
|
|
|
|
|
LOCAL_JAVACFLAGS += -source $(LOCAL_JAVA_LANGUAGE_VERSION) -target $(LOCAL_JAVA_LANGUAGE_VERSION)
|
|
|
|
|
|
Pass OpenJDK 8's bootclasspath for host tools targeting <= 1.8.
Host (as opposed to hostdex) tools compile and run against OpenJDK's
core libraries. Before this CL, the core libraries of the default
toolchain were always used, even when targeting an earlier language
version.
This meant that code that uses APIs from a later version of OpenJDK
than corresponded to LOCAL_JAVA_LANGUAGE_VERSION would compile, but
would fail to run under that earlier version of OpenJDK. It also
meant that calls to existing APIs might be reinterpreted; for
example, the return type of java.nio.ByteBuffer.clear() changed from
Buffer in OpenJDK 8 to ByteBuffer in OpenJDK 9. At compile time, this
was noted via the warning:
bootstrap class path not set in conjunction with -source 1.8
After this CL, when targeting a language version <= 1.8 (which is
always the case when building with OpenJDK 8), some of OpenJDK 8's
core library/tools jars are now passed on the bootclasspath. The
decision to include the bootclasspath argument when building with
OpenJDK 8 was somewhat arbitrary, but has the advantage that we
discover any issues before we switch to OpenJDK 9.
Even when compiling with OpenJDK 9, use of OpenJDK 9 APIs will now
fail at compile time rather than at runtime; calls to existing APIs
will now be interpreted in OpenJDK 8 rather than 9 fashion. For
example, this means that dx and host-side CTS tests built with
OpenJDK 9 javac -target 1.8 will be runnable under OpenJDK 8.
Bug: 70521453
Bug: 70862583
Test: Checked that the bootclasspath argument was passed
in the javac invocation targeting 1.8 during:
make showcommands compatibility-common-util-hostsidelib
Test: make checkbuild
Change-Id: I9b6081edfdd2c3e9a450ae8a39c4e32c3d2cda92
2017-12-21 02:36:56 +08:00
|
|
|
###########################################################
|
|
|
|
|
|
|
|
|
|
# OpenJDK versions up to 8 shipped with bootstrap and tools jars
|
|
|
|
|
# (rt.jar, jce.jar, tools.jar etc.). These are no longer part of
|
|
|
|
|
# OpenJDK 9, but we still make them available for host tools that
|
|
|
|
|
# are targeting older versions.
|
|
|
|
|
USE_HOST_BOOTSTRAP_JARS := true
|
|
|
|
|
ifeq (,$(filter $(LOCAL_JAVA_LANGUAGE_VERSION), 1.6 1.7 1.8))
|
|
|
|
|
USE_HOST_BOOTSTRAP_JARS := false
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
###########################################################
|
|
|
|
|
|
|
|
|
|
# Drop HOST_JDK_TOOLS_JAR from classpath when targeting versions > 9 (which don't have it).
|
|
|
|
|
# TODO: Remove HOST_JDK_TOOLS_JAR and all references to it once host
|
|
|
|
|
# bootstrap jars are no longer supported (ie. when USE_HOST_BOOTSTRAP_JARS
|
|
|
|
|
# is always false). http://b/38418220
|
|
|
|
|
ifneq ($(USE_HOST_BOOTSTRAP_JARS),true)
|
|
|
|
|
LOCAL_CLASSPATH := $(filter-out $(HOST_JDK_TOOLS_JAR),$(LOCAL_CLASSPATH))
|
|
|
|
|
endif
|
|
|
|
|
|
2015-08-29 02:47:03 +08:00
|
|
|
###########################################################
|
|
|
|
|
## .proto files: Compile proto files to .java
|
|
|
|
|
###########################################################
|
2017-10-08 11:44:05 +08:00
|
|
|
ifeq ($(strip $(LOCAL_PROTOC_OPTIMIZE_TYPE)),)
|
|
|
|
|
LOCAL_PROTOC_OPTIMIZE_TYPE := lite
|
|
|
|
|
endif
|
2015-08-29 02:47:03 +08:00
|
|
|
proto_sources := $(filter %.proto,$(LOCAL_SRC_FILES))
|
|
|
|
|
# Because names of the .java files compiled from .proto files are unknown until the
|
|
|
|
|
# .proto files are compiled, we use a timestamp file as depedency.
|
|
|
|
|
proto_java_sources_file_stamp :=
|
|
|
|
|
ifneq ($(proto_sources),)
|
|
|
|
|
proto_sources_fullpath := $(addprefix $(LOCAL_PATH)/, $(proto_sources))
|
|
|
|
|
|
2016-12-22 09:37:00 +08:00
|
|
|
proto_java_intemediate_dir := $(intermediates.COMMON)/proto
|
2015-08-29 02:47:03 +08:00
|
|
|
proto_java_sources_file_stamp := $(proto_java_intemediate_dir)/Proto.stamp
|
|
|
|
|
proto_java_sources_dir := $(proto_java_intemediate_dir)/src
|
|
|
|
|
|
|
|
|
|
$(proto_java_sources_file_stamp): PRIVATE_PROTO_INCLUDES := $(TOP)
|
|
|
|
|
$(proto_java_sources_file_stamp): PRIVATE_PROTO_SRC_FILES := $(proto_sources_fullpath)
|
|
|
|
|
$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_DIR := $(proto_java_sources_dir)
|
|
|
|
|
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro)
|
|
|
|
|
$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javamicro_out
|
|
|
|
|
else
|
|
|
|
|
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano)
|
|
|
|
|
$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javanano_out
|
|
|
|
|
else
|
2016-10-06 09:01:10 +08:00
|
|
|
ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),stream)
|
|
|
|
|
$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javastream_out
|
|
|
|
|
$(proto_java_sources_file_stamp): $(HOST_OUT_EXECUTABLES)/protoc-gen-javastream
|
|
|
|
|
else
|
2015-08-29 02:47:03 +08:00
|
|
|
$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --java_out
|
2016-10-06 09:01:10 +08:00
|
|
|
endif
|
2015-08-29 02:47:03 +08:00
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
$(proto_java_sources_file_stamp): PRIVATE_PROTOC_FLAGS := $(LOCAL_PROTOC_FLAGS)
|
2017-10-08 11:44:05 +08:00
|
|
|
$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_PARAMS := $(if $(filter lite,$(LOCAL_PROTOC_OPTIMIZE_TYPE)),lite$(if $(LOCAL_PROTO_JAVA_OUTPUT_PARAMS),:,),)$(LOCAL_PROTO_JAVA_OUTPUT_PARAMS)
|
2015-08-29 02:47:03 +08:00
|
|
|
$(proto_java_sources_file_stamp) : $(proto_sources_fullpath) $(PROTOC)
|
|
|
|
|
$(call transform-proto-to-java)
|
|
|
|
|
|
|
|
|
|
#TODO: protoc should output the dependencies introduced by imports.
|
2016-03-02 14:05:25 +08:00
|
|
|
|
|
|
|
|
ALL_MODULES.$(my_register_name).PROTO_FILES := $(proto_sources_fullpath)
|
2015-08-29 02:47:03 +08:00
|
|
|
endif # proto_sources
|
|
|
|
|
|
|
|
|
|
#########################################
|
|
|
|
|
## Java resources
|
|
|
|
|
|
|
|
|
|
# Look for resource files in any specified directories.
|
|
|
|
|
# Non-java and non-doc files will be picked up as resources
|
|
|
|
|
# and included in the output jar file.
|
|
|
|
|
java_resource_file_groups :=
|
|
|
|
|
|
|
|
|
|
LOCAL_JAVA_RESOURCE_DIRS := $(strip $(LOCAL_JAVA_RESOURCE_DIRS))
|
|
|
|
|
ifneq ($(LOCAL_JAVA_RESOURCE_DIRS),)
|
|
|
|
|
# This makes a list of words like
|
|
|
|
|
# <dir1>::<file1>:<file2> <dir2>::<file1> <dir3>:
|
|
|
|
|
# where each of the files is relative to the directory it's grouped with.
|
|
|
|
|
# Directories that don't contain any resource files will result in groups
|
|
|
|
|
# that end with a colon, and they are stripped out in the next step.
|
|
|
|
|
java_resource_file_groups += \
|
|
|
|
|
$(foreach dir,$(LOCAL_JAVA_RESOURCE_DIRS), \
|
|
|
|
|
$(subst $(space),:,$(strip \
|
|
|
|
|
$(LOCAL_PATH)/$(dir): \
|
2015-09-30 07:30:21 +08:00
|
|
|
$(patsubst ./%,%,$(sort $(shell cd $(LOCAL_PATH)/$(dir) && \
|
2015-08-29 02:47:03 +08:00
|
|
|
find . \
|
|
|
|
|
-type d -a -name ".svn" -prune -o \
|
|
|
|
|
-type f \
|
|
|
|
|
-a \! -name "*.java" \
|
|
|
|
|
-a \! -name "package.html" \
|
|
|
|
|
-a \! -name "overview.html" \
|
|
|
|
|
-a \! -name ".*.swp" \
|
|
|
|
|
-a \! -name ".DS_Store" \
|
|
|
|
|
-a \! -name "*~" \
|
|
|
|
|
-print \
|
2015-09-30 07:30:21 +08:00
|
|
|
))) \
|
2015-08-29 02:47:03 +08:00
|
|
|
)) \
|
|
|
|
|
)
|
|
|
|
|
java_resource_file_groups := $(filter-out %:,$(java_resource_file_groups))
|
|
|
|
|
endif # LOCAL_JAVA_RESOURCE_DIRS
|
|
|
|
|
|
|
|
|
|
ifneq ($(LOCAL_JAVA_RESOURCE_FILES),)
|
2017-09-23 04:34:10 +08:00
|
|
|
# Converts LOCAL_JAVA_RESOURCE_FILES := <file> to $(dir $(file))::$(notdir $(file))
|
|
|
|
|
# and LOCAL_JAVA_RESOURCE_FILES := <dir>:<file> to <dir>::<file>
|
|
|
|
|
java_resource_file_groups += $(strip $(foreach res,$(LOCAL_JAVA_RESOURCE_FILES), \
|
|
|
|
|
$(eval _file := $(call word-colon,2,$(res))) \
|
|
|
|
|
$(if $(_file), \
|
|
|
|
|
$(eval _base := $(call word-colon,1,$(res))), \
|
|
|
|
|
$(eval _base := $(dir $(res))) \
|
|
|
|
|
$(eval _file := $(notdir $(res)))) \
|
|
|
|
|
$(if $(filter /%, \
|
|
|
|
|
$(filter-out $(OUT_DIR)/%,$(_base) $(_file))), \
|
|
|
|
|
$(call pretty-error,LOCAL_JAVA_RESOURCE_FILES may not include absolute paths: $(_base) $(_file))) \
|
|
|
|
|
$(patsubst %/,%,$(_base))::$(_file)))
|
|
|
|
|
|
2015-08-29 02:47:03 +08:00
|
|
|
endif # LOCAL_JAVA_RESOURCE_FILES
|
|
|
|
|
|
|
|
|
|
ifdef java_resource_file_groups
|
|
|
|
|
# The full paths to all resources, used for dependencies.
|
|
|
|
|
java_resource_sources := \
|
|
|
|
|
$(foreach group,$(java_resource_file_groups), \
|
|
|
|
|
$(addprefix $(word 1,$(subst :,$(space),$(group)))/, \
|
|
|
|
|
$(wordlist 2,9999,$(subst :,$(space),$(group))) \
|
|
|
|
|
) \
|
|
|
|
|
)
|
|
|
|
|
# The arguments to jar that will include these files in a jar file.
|
|
|
|
|
# Quote the file name to handle special characters (such as #) correctly.
|
|
|
|
|
extra_jar_args := \
|
|
|
|
|
$(foreach group,$(java_resource_file_groups), \
|
|
|
|
|
$(addprefix -C "$(word 1,$(subst :,$(space),$(group)))" , \
|
|
|
|
|
$(foreach w, $(wordlist 2,9999,$(subst :,$(space),$(group))), "$(w)" ) \
|
|
|
|
|
) \
|
|
|
|
|
)
|
|
|
|
|
java_resource_file_groups :=
|
|
|
|
|
else
|
|
|
|
|
java_resource_sources :=
|
|
|
|
|
extra_jar_args :=
|
|
|
|
|
endif # java_resource_file_groups
|
|
|
|
|
|
2016-04-27 06:49:56 +08:00
|
|
|
#####################################
|
|
|
|
|
## Warn if there is unrecognized file in LOCAL_SRC_FILES.
|
|
|
|
|
my_unknown_src_files := $(filter-out \
|
|
|
|
|
%.java %.aidl %.proto %.logtags %.fs %.rs, \
|
|
|
|
|
$(LOCAL_SRC_FILES) $(LOCAL_INTERMEDIATE_SOURCES) $(LOCAL_GENERATED_SOURCES))
|
|
|
|
|
ifneq ($(my_unknown_src_files),)
|
|
|
|
|
$(warning $(LOCAL_MODULE_MAKEFILE): $(LOCAL_MODULE): Unused source files: $(my_unknown_src_files))
|
|
|
|
|
endif
|
|
|
|
|
|
2015-08-29 02:47:03 +08:00
|
|
|
######################################
|
|
|
|
|
## PRIVATE java vars
|
|
|
|
|
# LOCAL_SOURCE_FILES_ALL_GENERATED is set only if the module does not have static source files,
|
|
|
|
|
# but generated source files in its LOCAL_INTERMEDIATE_SOURCE_DIR.
|
|
|
|
|
# You have to set up the dependency in some other way.
|
|
|
|
|
need_compile_java := $(strip $(all_java_sources)$(all_res_assets)$(java_resource_sources))$(LOCAL_STATIC_JAVA_LIBRARIES)$(filter true,$(LOCAL_SOURCE_FILES_ALL_GENERATED))
|
|
|
|
|
ifdef need_compile_java
|
|
|
|
|
|
2017-04-08 07:28:41 +08:00
|
|
|
annotation_processor_flags :=
|
|
|
|
|
annotation_processor_deps :=
|
|
|
|
|
|
|
|
|
|
ifdef LOCAL_ANNOTATION_PROCESSORS
|
2017-09-14 04:13:53 +08:00
|
|
|
annotation_processor_jars := $(call java-lib-files,$(LOCAL_ANNOTATION_PROCESSORS),true)
|
2017-04-08 07:28:41 +08:00
|
|
|
annotation_processor_flags += -processorpath $(call normalize-path-list,$(annotation_processor_jars))
|
|
|
|
|
annotation_processor_deps += $(annotation_processor_jars)
|
|
|
|
|
|
|
|
|
|
# b/25860419: annotation processors must be explicitly specified for grok
|
|
|
|
|
annotation_processor_flags += $(foreach class,$(LOCAL_ANNOTATION_PROCESSOR_CLASSES),-processor $(class))
|
|
|
|
|
|
|
|
|
|
annotation_processor_jars :=
|
|
|
|
|
endif
|
|
|
|
|
|
2017-09-27 05:55:43 +08:00
|
|
|
full_static_java_libs := $(call java-lib-files,$(LOCAL_STATIC_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))
|
|
|
|
|
full_static_java_header_libs := $(call java-lib-header-files,$(LOCAL_STATIC_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))
|
2017-09-01 05:43:04 +08:00
|
|
|
|
2015-08-29 02:47:03 +08:00
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JAVA_LIBRARIES := $(full_static_java_libs)
|
2017-09-01 05:43:04 +08:00
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JAVA_HEADER_LIBRARIES := $(full_static_java_header_libs)
|
2015-08-29 02:47:03 +08:00
|
|
|
|
|
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR)
|
|
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASSET_DIR := $(LOCAL_ASSET_DIR)
|
|
|
|
|
|
|
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CLASS_INTERMEDIATES_DIR := $(intermediates.COMMON)/classes
|
2017-04-08 07:28:41 +08:00
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ANNO_INTERMEDIATES_DIR := $(intermediates.COMMON)/anno
|
2015-08-29 02:47:03 +08:00
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SOURCE_INTERMEDIATES_DIR := $(intermediates.COMMON)/src
|
2016-12-22 09:37:00 +08:00
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HAS_PROTO_SOURCES := $(if $(proto_sources),true)
|
|
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_PROTO_SOURCE_INTERMEDIATES_DIR := $(intermediates.COMMON)/proto
|
|
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HAS_RS_SOURCES :=
|
2015-08-29 02:47:03 +08:00
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_SOURCES := $(all_java_sources)
|
2017-05-27 06:22:02 +08:00
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_SOURCE_LIST := $(java_source_list_file)
|
2015-08-29 02:47:03 +08:00
|
|
|
|
|
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RMTYPEDEFS := $(LOCAL_RMTYPEDEFS)
|
|
|
|
|
|
2017-09-24 09:19:05 +08:00
|
|
|
full_java_bootclasspath_libs :=
|
|
|
|
|
empty_bootclasspath :=
|
2017-10-13 04:34:40 +08:00
|
|
|
my_system_modules :=
|
2017-09-24 09:19:05 +08:00
|
|
|
|
2015-08-29 02:47:03 +08:00
|
|
|
ifndef LOCAL_IS_HOST_MODULE
|
2017-09-24 10:47:37 +08:00
|
|
|
ifeq ($(LOCAL_SDK_VERSION),)
|
|
|
|
|
ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
|
|
|
|
|
# No bootclasspath. But we still need "" to prevent javac from using default host bootclasspath.
|
2017-09-24 09:19:05 +08:00
|
|
|
empty_bootclasspath := ""
|
2017-10-13 04:34:40 +08:00
|
|
|
# Most users of LOCAL_NO_STANDARD_LIBRARIES really mean no framework libs,
|
|
|
|
|
# and manually add back the core libs. The ones that don't are in soong
|
|
|
|
|
# now, so just always assume that they want the default system modules
|
|
|
|
|
my_system_modules := $(DEFAULT_SYSTEM_MODULES)
|
2017-09-24 10:47:37 +08:00
|
|
|
else # LOCAL_NO_STANDARD_LIBRARIES
|
2017-10-26 08:33:38 +08:00
|
|
|
full_java_bootclasspath_libs := $(call java-lib-header-files,$(TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES) $(TARGET_DEFAULT_JAVA_LIBRARIES))
|
|
|
|
|
LOCAL_JAVA_LIBRARIES := $(filter-out $(TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES) $(TARGET_DEFAULT_JAVA_LIBRARIES),$(LOCAL_JAVA_LIBRARIES))
|
2017-10-13 04:34:40 +08:00
|
|
|
my_system_modules := $(DEFAULT_SYSTEM_MODULES)
|
2017-09-24 10:47:37 +08:00
|
|
|
endif # LOCAL_NO_STANDARD_LIBRARIES
|
|
|
|
|
else
|
2017-09-24 10:52:43 +08:00
|
|
|
ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
|
|
|
|
|
$(call pretty-error,Must not define both LOCAL_NO_STANDARD_LIBRARIES and LOCAL_SDK_VERSION)
|
|
|
|
|
endif
|
|
|
|
|
ifeq ($(strip $(filter $(LOCAL_SDK_VERSION),$(TARGET_AVAILABLE_SDK_VERSIONS))),)
|
|
|
|
|
$(call pretty-error,Invalid LOCAL_SDK_VERSION '$(LOCAL_SDK_VERSION)' \
|
|
|
|
|
Choices are: $(TARGET_AVAILABLE_SDK_VERSIONS))
|
|
|
|
|
endif
|
2017-09-24 10:47:37 +08:00
|
|
|
ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),current)
|
|
|
|
|
# LOCAL_SDK_VERSION is current and no TARGET_BUILD_APPS.
|
2017-09-24 09:19:05 +08:00
|
|
|
full_java_bootclasspath_libs := $(call java-lib-header-files,android_stubs_current)
|
2017-09-24 10:47:37 +08:00
|
|
|
else ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),system_current)
|
2017-09-24 09:19:05 +08:00
|
|
|
full_java_bootclasspath_libs := $(call java-lib-header-files,android_system_stubs_current)
|
2017-09-24 10:47:37 +08:00
|
|
|
else ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),test_current)
|
2017-09-24 09:19:05 +08:00
|
|
|
full_java_bootclasspath_libs := $(call java-lib-header-files,android_test_stubs_current)
|
2017-09-24 10:47:37 +08:00
|
|
|
else
|
2017-10-16 18:20:34 +08:00
|
|
|
ifneq (,$(call has-system-sdk-version,$(LOCAL_SDK_VERSION)))
|
2017-11-30 15:28:22 +08:00
|
|
|
ifeq (,$(TARGET_BUILD_APPS))
|
|
|
|
|
full_java_bootclasspath_libs := $(call java-lib-header-files,system_sdk_v$(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION)))
|
|
|
|
|
else
|
|
|
|
|
full_java_bootclasspath_libs := $(call java-lib-header-files,sdk_v$(LOCAL_SDK_VERSION))
|
|
|
|
|
endif
|
2017-10-16 18:20:34 +08:00
|
|
|
else
|
|
|
|
|
full_java_bootclasspath_libs := $(call java-lib-header-files,sdk_v$(LOCAL_SDK_VERSION))
|
|
|
|
|
endif
|
|
|
|
|
endif # current, system_current, system_${VER} or test_current
|
2017-09-24 10:47:37 +08:00
|
|
|
endif # LOCAL_SDK_VERSION
|
|
|
|
|
|
2017-11-01 05:05:35 +08:00
|
|
|
ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
|
|
|
|
|
ifneq ($(LOCAL_MODULE),jacocoagent)
|
|
|
|
|
ifeq ($(EMMA_INSTRUMENT),true)
|
|
|
|
|
ifneq ($(EMMA_INSTRUMENT_STATIC),true)
|
|
|
|
|
# For instrumented build, if Jacoco is not being included statically
|
|
|
|
|
# in instrumented packages then include Jacoco classes into the
|
|
|
|
|
# bootclasspath.
|
|
|
|
|
full_java_bootclasspath_libs += $(call java-lib-header-files,jacocoagent)
|
|
|
|
|
endif # EMMA_INSTRUMENT_STATIC
|
|
|
|
|
endif # EMMA_INSTRUMENT
|
|
|
|
|
endif # LOCAL_MODULE == jacocoagent
|
|
|
|
|
endif # LOCAL_NO_STANDARD_LIBRARIES
|
|
|
|
|
|
2017-09-24 10:47:37 +08:00
|
|
|
# In order to compile lambda code javac requires various invokedynamic-
|
|
|
|
|
# related classes to be present. This change adds stubs needed for
|
|
|
|
|
# javac to compile lambdas.
|
2017-09-23 06:03:38 +08:00
|
|
|
ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
|
|
|
|
|
ifdef TARGET_BUILD_APPS
|
|
|
|
|
full_java_bootclasspath_libs += $(call java-lib-header-files,sdk-core-lambda-stubs)
|
|
|
|
|
else
|
|
|
|
|
full_java_bootclasspath_libs += $(call java-lib-header-files,core-lambda-stubs)
|
2017-09-24 10:47:37 +08:00
|
|
|
endif
|
|
|
|
|
endif
|
2016-02-19 18:37:22 +08:00
|
|
|
|
2017-09-23 06:03:38 +08:00
|
|
|
full_shared_java_libs := $(call java-lib-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))
|
|
|
|
|
full_shared_java_header_libs := $(call java-lib-header-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))
|
2015-08-29 02:47:03 +08:00
|
|
|
|
|
|
|
|
else # LOCAL_IS_HOST_MODULE
|
|
|
|
|
|
2017-09-24 10:47:37 +08:00
|
|
|
ifeq ($(USE_CORE_LIB_BOOTCLASSPATH),true)
|
|
|
|
|
ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
|
2017-09-24 09:19:05 +08:00
|
|
|
empty_bootclasspath := ""
|
2017-09-24 10:47:37 +08:00
|
|
|
else
|
2017-09-24 10:52:43 +08:00
|
|
|
full_java_bootclasspath_libs := $(call java-lib-header-files,$(addsuffix -hostdex,$(TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES)),true)
|
2017-09-24 10:47:37 +08:00
|
|
|
endif
|
2015-08-29 02:47:03 +08:00
|
|
|
|
2017-10-13 04:34:40 +08:00
|
|
|
my_system_modules := $(DEFAULT_SYSTEM_MODULES)
|
2017-09-24 10:47:37 +08:00
|
|
|
full_shared_java_libs := $(call java-lib-files,$(LOCAL_JAVA_LIBRARIES),true)
|
|
|
|
|
full_shared_java_header_libs := $(call java-lib-header-files,$(LOCAL_JAVA_LIBRARIES),true)
|
|
|
|
|
else # !USE_CORE_LIB_BOOTCLASSPATH
|
Pass OpenJDK 8's bootclasspath for host tools targeting <= 1.8.
Host (as opposed to hostdex) tools compile and run against OpenJDK's
core libraries. Before this CL, the core libraries of the default
toolchain were always used, even when targeting an earlier language
version.
This meant that code that uses APIs from a later version of OpenJDK
than corresponded to LOCAL_JAVA_LANGUAGE_VERSION would compile, but
would fail to run under that earlier version of OpenJDK. It also
meant that calls to existing APIs might be reinterpreted; for
example, the return type of java.nio.ByteBuffer.clear() changed from
Buffer in OpenJDK 8 to ByteBuffer in OpenJDK 9. At compile time, this
was noted via the warning:
bootstrap class path not set in conjunction with -source 1.8
After this CL, when targeting a language version <= 1.8 (which is
always the case when building with OpenJDK 8), some of OpenJDK 8's
core library/tools jars are now passed on the bootclasspath. The
decision to include the bootclasspath argument when building with
OpenJDK 8 was somewhat arbitrary, but has the advantage that we
discover any issues before we switch to OpenJDK 9.
Even when compiling with OpenJDK 9, use of OpenJDK 9 APIs will now
fail at compile time rather than at runtime; calls to existing APIs
will now be interpreted in OpenJDK 8 rather than 9 fashion. For
example, this means that dx and host-side CTS tests built with
OpenJDK 9 javac -target 1.8 will be runnable under OpenJDK 8.
Bug: 70521453
Bug: 70862583
Test: Checked that the bootclasspath argument was passed
in the javac invocation targeting 1.8 during:
make showcommands compatibility-common-util-hostsidelib
Test: make checkbuild
Change-Id: I9b6081edfdd2c3e9a450ae8a39c4e32c3d2cda92
2017-12-21 02:36:56 +08:00
|
|
|
# Give host-side tools a version of OpenJDK's standard libraries
|
|
|
|
|
# close to what they're targeting. As of Dec 2017, AOSP is only
|
|
|
|
|
# bundling OpenJDK 8 and 9, so nothing < 8 is available.
|
|
|
|
|
#
|
|
|
|
|
# When building with OpenJDK 8, the following should have no
|
|
|
|
|
# effect since those jars would be available by default.
|
|
|
|
|
#
|
|
|
|
|
# When building with OpenJDK 9 but targeting a version < 1.8,
|
|
|
|
|
# putting them on the bootclasspath means that:
|
|
|
|
|
# a) code can't (accidentally) refer to OpenJDK 9 specific APIs
|
|
|
|
|
# b) references to existing APIs are not reinterpreted in an
|
|
|
|
|
# OpenJDK 9-specific way, eg. calls to subclasses of
|
|
|
|
|
# java.nio.Buffer as in http://b/70862583
|
|
|
|
|
ifeq ($(USE_HOST_BOOTSTRAP_JARS),true)
|
|
|
|
|
full_java_bootclasspath_libs += $(ANDROID_JAVA8_HOME)/jre/lib/jce.jar
|
|
|
|
|
full_java_bootclasspath_libs += $(ANDROID_JAVA8_HOME)/jre/lib/rt.jar
|
|
|
|
|
endif
|
2017-09-24 10:47:37 +08:00
|
|
|
full_shared_java_libs := $(addprefix $(HOST_OUT_JAVA_LIBRARIES)/,\
|
|
|
|
|
$(addsuffix $(COMMON_JAVA_PACKAGE_SUFFIX),$(LOCAL_JAVA_LIBRARIES)))
|
2017-10-26 08:33:38 +08:00
|
|
|
full_shared_java_header_libs := $(full_shared_java_libs)
|
2017-09-24 10:47:37 +08:00
|
|
|
endif # USE_CORE_LIB_BOOTCLASSPATH
|
2015-08-29 02:47:03 +08:00
|
|
|
endif # !LOCAL_IS_HOST_MODULE
|
|
|
|
|
|
2017-09-24 09:19:05 +08:00
|
|
|
ifdef empty_bootclasspath
|
|
|
|
|
ifdef full_java_bootclasspath_libs
|
|
|
|
|
$(call pretty-error,internal error: empty_bootclasspath and full_java_bootclasspath_libs should not both be set)
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
2017-10-13 04:34:40 +08:00
|
|
|
full_java_system_modules_deps :=
|
|
|
|
|
my_system_modules_dir :=
|
|
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_USE_SYSTEM_MODULES :=
|
|
|
|
|
ifeq ($(LOCAL_JAVA_LANGUAGE_VERSION),1.9)
|
|
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_USE_SYSTEM_MODULES := true
|
|
|
|
|
ifdef my_system_modules
|
|
|
|
|
ifneq ($(my_system_modules),none)
|
|
|
|
|
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)))
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
2017-09-24 10:52:43 +08:00
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := $(full_java_bootclasspath_libs)
|
|
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_EMPTY_BOOTCLASSPATH := $(empty_bootclasspath)
|
2017-11-02 00:53:09 +08:00
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SYSTEM_MODULES := $(my_system_modules)
|
|
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SYSTEM_MODULES_DIR := $(my_system_modules_dir)
|
|
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SYSTEM_MODULES_LIBS := $(call java-lib-files,$(SOONG_SYSTEM_MODULES_LIBS_$(my_system_modules)))
|
2018-01-10 04:33:08 +08:00
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_PATCH_MODULE := $(LOCAL_PATCH_MODULE)
|
2017-09-24 09:19:05 +08:00
|
|
|
|
2015-08-29 02:47:03 +08:00
|
|
|
ifndef LOCAL_IS_HOST_MODULE
|
|
|
|
|
# This is set by packages that are linking to other packages that export
|
|
|
|
|
# shared libraries, allowing them to make use of the code in the linked apk.
|
|
|
|
|
apk_libraries := $(sort $(LOCAL_APK_LIBRARIES) $(LOCAL_RES_LIBRARIES))
|
|
|
|
|
ifneq ($(apk_libraries),)
|
2017-09-27 05:55:43 +08:00
|
|
|
link_apk_libraries := $(call app-lib-files,$(apk_libraries))
|
|
|
|
|
link_apk_header_libs := $(call app-lib-header-files,$(apk_libraries))
|
2015-08-29 02:47:03 +08:00
|
|
|
|
|
|
|
|
# link against the jar with full original names (before proguard processing).
|
|
|
|
|
full_shared_java_libs += $(link_apk_libraries)
|
2017-10-26 08:33:38 +08:00
|
|
|
full_shared_java_header_libs += $(link_apk_header_libs)
|
2015-08-29 02:47:03 +08:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# This is set by packages that contain instrumentation, allowing them to
|
|
|
|
|
# link against the package they are instrumenting. Currently only one such
|
|
|
|
|
# package is allowed.
|
|
|
|
|
LOCAL_INSTRUMENTATION_FOR := $(strip $(LOCAL_INSTRUMENTATION_FOR))
|
|
|
|
|
ifdef LOCAL_INSTRUMENTATION_FOR
|
|
|
|
|
ifneq ($(words $(LOCAL_INSTRUMENTATION_FOR)),1)
|
|
|
|
|
$(error \
|
|
|
|
|
$(LOCAL_PATH): Multiple LOCAL_INSTRUMENTATION_FOR members defined)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
link_instr_intermediates_dir.COMMON := $(call intermediates-dir-for, \
|
|
|
|
|
APPS,$(LOCAL_INSTRUMENTATION_FOR),,COMMON)
|
|
|
|
|
# link against the jar with full original names (before proguard processing).
|
2017-04-06 06:30:42 +08:00
|
|
|
link_instr_classes_jar := $(link_instr_intermediates_dir.COMMON)/classes-pre-proguard.jar
|
2017-09-27 07:17:24 +08:00
|
|
|
ifneq ($(TURBINE_ENABLED),false)
|
|
|
|
|
link_instr_classes_header_jar := $(link_instr_intermediates_dir.COMMON)/classes-header.jar
|
|
|
|
|
else
|
|
|
|
|
link_instr_classes_header_jar := $(link_instr_intermediates_dir.COMMON)/classes.jar
|
|
|
|
|
endif
|
2017-10-26 08:33:38 +08:00
|
|
|
full_shared_java_libs += $(link_instr_classes_jar)
|
|
|
|
|
full_shared_java_header_libs += $(link_instr_classes_header_jar)
|
2015-08-29 02:47:03 +08:00
|
|
|
endif # LOCAL_INSTRUMENTATION_FOR
|
|
|
|
|
endif # LOCAL_IS_HOST_MODULE
|
|
|
|
|
|
|
|
|
|
endif # need_compile_java
|
|
|
|
|
|
|
|
|
|
# We may want to add jar manifest or jar resource files even if there is no java code at all.
|
|
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_EXTRA_JAR_ARGS := $(extra_jar_args)
|
|
|
|
|
jar_manifest_file :=
|
|
|
|
|
ifneq ($(strip $(LOCAL_JAR_MANIFEST)),)
|
|
|
|
|
jar_manifest_file := $(LOCAL_PATH)/$(LOCAL_JAR_MANIFEST)
|
|
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAR_MANIFEST := $(jar_manifest_file)
|
|
|
|
|
else
|
|
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAR_MANIFEST :=
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
##########################################################
|
|
|
|
|
ifndef LOCAL_IS_HOST_MODULE
|
|
|
|
|
## AAPT Flags
|
|
|
|
|
# aapt doesn't accept multiple --extra-packages flags.
|
|
|
|
|
# We have to collapse them into a single --extra-packages flag here.
|
|
|
|
|
LOCAL_AAPT_FLAGS := $(strip $(LOCAL_AAPT_FLAGS))
|
|
|
|
|
ifdef LOCAL_AAPT_FLAGS
|
|
|
|
|
ifeq ($(filter 0 1,$(words $(filter --extra-packages,$(LOCAL_AAPT_FLAGS)))),)
|
|
|
|
|
aapt_flags := $(subst --extra-packages$(space),--extra-packages@,$(LOCAL_AAPT_FLAGS))
|
|
|
|
|
aapt_flags_extra_packages := $(patsubst --extra-packages@%,%,$(filter --extra-packages@%,$(aapt_flags)))
|
|
|
|
|
aapt_flags_extra_packages := $(sort $(subst :,$(space),$(aapt_flags_extra_packages)))
|
|
|
|
|
LOCAL_AAPT_FLAGS := $(filter-out --extra-packages@%,$(aapt_flags)) \
|
|
|
|
|
--extra-packages $(subst $(space),:,$(aapt_flags_extra_packages))
|
|
|
|
|
aapt_flags_extra_packages :=
|
|
|
|
|
aapt_flags :=
|
|
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
2016-03-30 03:41:42 +08:00
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) $(PRODUCT_AAPT_FLAGS)
|
|
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_AAPT_CHARACTERISTICS := $(TARGET_AAPT_CHARACTERISTICS)
|
|
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MANIFEST_PACKAGE_NAME := $(LOCAL_MANIFEST_PACKAGE_NAME)
|
|
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MANIFEST_INSTRUMENTATION_FOR := $(LOCAL_MANIFEST_INSTRUMENTATION_FOR)
|
2015-08-29 02:47:03 +08:00
|
|
|
|
|
|
|
|
ifdef aidl_sources
|
|
|
|
|
ALL_MODULES.$(my_register_name).AIDL_FILES := $(aidl_sources)
|
|
|
|
|
endif
|
2016-03-02 14:05:25 +08:00
|
|
|
ifdef renderscript_sources
|
|
|
|
|
ALL_MODULES.$(my_register_name).RS_FILES := $(renderscript_sources_fullpath)
|
|
|
|
|
endif
|
2015-08-29 02:47:03 +08:00
|
|
|
endif # !LOCAL_IS_HOST_MODULE
|
|
|
|
|
|
2017-10-26 08:33:38 +08:00
|
|
|
full_java_libs := $(full_shared_java_libs) $(full_static_java_libs) $(LOCAL_CLASSPATH)
|
|
|
|
|
full_java_header_libs := $(full_shared_java_header_libs) $(full_static_java_header_libs)
|
|
|
|
|
|
2016-03-30 03:41:42 +08:00
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ALL_JAVA_LIBRARIES := $(full_java_libs)
|
2017-09-01 05:43:04 +08:00
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ALL_JAVA_HEADER_LIBRARIES := $(full_java_header_libs)
|
2017-10-26 08:33:38 +08:00
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SHARED_JAVA_HEADER_LIBRARIES := $(full_shared_java_header_libs)
|
2015-08-29 02:47:03 +08:00
|
|
|
|
|
|
|
|
ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR := \
|
|
|
|
|
$(ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR) $(LOCAL_INTERMEDIATE_SOURCE_DIR)
|
|
|
|
|
|
2016-07-09 12:33:05 +08:00
|
|
|
###########################################################
|
|
|
|
|
# Verify that all libraries are safe to use
|
|
|
|
|
###########################################################
|
|
|
|
|
ifndef LOCAL_IS_HOST_MODULE
|
|
|
|
|
ifeq ($(LOCAL_SDK_VERSION),system_current)
|
2017-04-08 15:31:31 +08:00
|
|
|
my_link_type := java:system
|
|
|
|
|
my_warn_types := java:platform
|
|
|
|
|
my_allowed_types := java:sdk java:system
|
2017-10-16 18:20:34 +08:00
|
|
|
else ifneq (,$(call has-system-sdk-version,$(LOCAL_SDK_VERSION)))
|
|
|
|
|
my_link_type := java:system
|
|
|
|
|
my_warn_types := java:platform
|
|
|
|
|
my_allowed_types := java:sdk java:system
|
2016-07-09 12:33:05 +08:00
|
|
|
else ifneq ($(LOCAL_SDK_VERSION),)
|
2017-04-08 15:31:31 +08:00
|
|
|
my_link_type := java:sdk
|
|
|
|
|
my_warn_types := java:system java:platform
|
|
|
|
|
my_allowed_types := java:sdk
|
2016-07-09 12:33:05 +08:00
|
|
|
else
|
2017-04-08 15:31:31 +08:00
|
|
|
my_link_type := java:platform
|
|
|
|
|
my_warn_types :=
|
|
|
|
|
my_allowed_types := java:sdk java:system java:platform
|
2016-07-09 12:33:05 +08:00
|
|
|
endif
|
2017-04-08 15:31:31 +08:00
|
|
|
|
2017-11-18 07:39:52 +08:00
|
|
|
ifdef LOCAL_AAPT2_ONLY
|
|
|
|
|
my_link_type += aapt2_only
|
|
|
|
|
endif
|
|
|
|
|
ifdef LOCAL_USE_AAPT2
|
|
|
|
|
my_allowed_types += aapt2_only
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
my_link_deps := $(addprefix JAVA_LIBRARIES:,$(LOCAL_STATIC_JAVA_LIBRARIES) $(LOCAL_JAVA_LIBRARIES))
|
2017-04-08 15:31:31 +08:00
|
|
|
my_link_deps += $(addprefix APPS:,$(apk_libraries))
|
|
|
|
|
|
|
|
|
|
my_2nd_arch_prefix := $(LOCAL_2ND_ARCH_VAR_PREFIX)
|
|
|
|
|
my_common := COMMON
|
|
|
|
|
include $(BUILD_SYSTEM)/link_type.mk
|
2016-07-09 12:33:05 +08:00
|
|
|
endif # !LOCAL_IS_HOST_MODULE
|
2017-12-07 06:37:06 +08:00
|
|
|
|
|
|
|
|
ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
|
|
|
|
|
|
|
|
|
|
SOONG_CONV.$(LOCAL_MODULE).PROBLEMS := \
|
|
|
|
|
$(SOONG_CONV.$(LOCAL_MODULE).PROBLEMS) $(my_soong_problems)
|
|
|
|
|
SOONG_CONV.$(LOCAL_MODULE).DEPS := \
|
|
|
|
|
$(SOONG_CONV.$(LOCAL_MODULE).DEPS) \
|
|
|
|
|
$(LOCAL_STATIC_JAVA_LIBRARIES) \
|
|
|
|
|
$(LOCAL_JAVA_LIBRARIES) \
|
|
|
|
|
$(LOCAL_JNI_SHARED_LIBRARIES)
|
|
|
|
|
SOONG_CONV.$(LOCAL_MODULE).TYPE := java
|
|
|
|
|
SOONG_CONV := $(SOONG_CONV) $(LOCAL_MODULE)
|
|
|
|
|
|
|
|
|
|
endif
|