StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '1b140e16e1d8dd022331242fcd5a3a1e8548fa4b':
  Build hostdex on only Linux.
  Fix comma in $(if ...).
This commit is contained in:
Ying Wang
2015-01-26 19:12:18 +00:00
committed by Android Git Automerger
parent f633e28168 1b140e16e1
commit 21f78782d5
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/definitions.mk
View File

@@ -1330,7 +1330,7 @@ define transform-o-to-shared-lib-inner
$(hide) $(PRIVATE_CXX) \ $(hide) $(PRIVATE_CXX) \
-nostdlib -Wl,-soname,$(notdir $@) \ -nostdlib -Wl,-soname,$(notdir $@) \
-Wl,--gc-sections \ -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) \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \ $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \
$(PRIVATE_ALL_OBJECTS) \ $(PRIVATE_ALL_OBJECTS) \

3
core/host_dalvik_java_library.mk
View File

@@ -20,6 +20,7 @@
# They will be compiled against libcore and not the host JRE. # They will be compiled against libcore and not the host JRE.
# #
ifeq ($(HOST_OS),linux)
USE_CORE_LIB_BOOTCLASSPATH := true USE_CORE_LIB_BOOTCLASSPATH := true
####################################### #######################################
@@ -108,3 +109,5 @@ $(LOCAL_BUILT_MODULE): $(built_dex) $(java_resource_sources)
$(add-dex-to-package) $(add-dex-to-package)
USE_CORE_LIB_BOOTCLASSPATH := USE_CORE_LIB_BOOTCLASSPATH :=
endif

3
core/host_dalvik_static_java_library.mk
View File

@@ -19,6 +19,7 @@
# These libraries will be compiled against libcore and not the host # These libraries will be compiled against libcore and not the host
# JRE. # JRE.
# #
ifeq ($(HOST_OS),linux)
USE_CORE_LIB_BOOTCLASSPATH := true USE_CORE_LIB_BOOTCLASSPATH := true
LOCAL_JAVA_LIBRARIES += core-libart-hostdex LOCAL_JAVA_LIBRARIES += core-libart-hostdex
@@ -26,3 +27,5 @@ LOCAL_JAVA_LIBRARIES += core-libart-hostdex
include $(BUILD_SYSTEM)/host_java_library.mk include $(BUILD_SYSTEM)/host_java_library.mk
USE_CORE_LIB_BOOTCLASSPATH := USE_CORE_LIB_BOOTCLASSPATH :=
endif