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

Commit 46946172 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Fix unbundled jack builds" am: fcdbbd0d 

am: b7665ed2

Change-Id: Iee86222934e9d29c8a0c367dc4848f9a945f050d
parents 6f2e41db b7665ed2

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