Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a68e5e6 authored by Colin Cross's avatar Colin Cross
Browse files

Fix unbundled jack builds 

Recent change Icbc8987468f237aa351708b33c3abe5ea3d1816e was
unconditionally adding core-oj and core-libart as the
bootclasspath for all jack compiles, which is incorrect and
was breaking unbundled builds that don't have sources for
core-oj and core-libart.  Only add them when LOCAL_SDK_VERSION
is not set.

Test: unbundled build
Change-Id: I6bab7e36e8178384f13cf9df8183a53fcb4b23f8
parent e58881ac

core/java_common.mk

+7 −5
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ full_static_jack_libs := \ 
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JACK_LIBRARIES := $(full_static_jack_libs)



full_shared_jack_libs := $(call jack-lib-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))

ifndef LOCAL_SDK_VERSION

  ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)

    my_jack_bootclasspath := $(TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES)

    ifdef LOCAL_IS_HOST_MODULE
@@ -391,6 +392,7 @@ ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true) 
    endif

    full_shared_jack_libs := $(call jack-lib-files,$(my_jack_bootclasspath),$(LOCAL_IS_HOST_MODULE)) $(full_shared_jack_libs)

  endif

endif

full_jack_deps := $(full_shared_jack_libs)



ifndef LOCAL_IS_HOST_MODULE