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

Commit 21f78782 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 1b140e16: Merge "Build hostdex on only Linux." 

* commit '1b140e16':
  Build hostdex on only Linux.
  Fix comma in $(if ...).
parents f633e281 1b140e16

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -1330,7 +1330,7 @@ define transform-o-to-shared-lib-inner 
$(hide) $(PRIVATE_CXX) \

	-nostdlib -Wl,-soname,$(notdir $@) \

	-Wl,--gc-sections \

	$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \

	$(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl$(comma)-shared) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \

	$(PRIVATE_ALL_OBJECTS) \

core/host_dalvik_java_library.mk

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
# They will be compiled against libcore and not the host JRE.

#



ifeq ($(HOST_OS),linux)

USE_CORE_LIB_BOOTCLASSPATH := true



#######################################
@@ -108,3 +109,5 @@ $(LOCAL_BUILT_MODULE): $(built_dex) $(java_resource_sources) 
	$(add-dex-to-package)



USE_CORE_LIB_BOOTCLASSPATH :=



endif

core/host_dalvik_static_java_library.mk

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
# These libraries will be compiled against libcore and not the host

# JRE.

#

ifeq ($(HOST_OS),linux)



USE_CORE_LIB_BOOTCLASSPATH := true

LOCAL_JAVA_LIBRARIES += core-libart-hostdex
@@ -26,3 +27,5 @@ LOCAL_JAVA_LIBRARIES += core-libart-hostdex 
include $(BUILD_SYSTEM)/host_java_library.mk



USE_CORE_LIB_BOOTCLASSPATH :=



endif