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

am d864f439: Merge "Remove from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set."

Browse Source 
* commit 'd864f43932cb0da10837efb0da270af4cbfc0f91':
  Remove $(DEX2OAT) from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set.
This commit is contained in:
Ying Wang
2015-07-29 17:21:15 +00:00
committed by Android Git Automerger
parent 8a5a0356e8 d864f43932
commit 43275b9af5
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/dex_preopt_libart.mk
View File

@@ -3,8 +3,13 @@
# #
#################################### ####################################
# Default to debug version to help find bugs.
# Set USE_DEX2OAT_DEBUG to false for only building non-debug versions.
ifeq ($(USE_DEX2OAT_DEBUG),false)
DEX2OAT := $(HOST_OUT_EXECUTABLES)/dex2oat$(HOST_EXECUTABLE_SUFFIX) DEX2OAT := $(HOST_OUT_EXECUTABLES)/dex2oat$(HOST_EXECUTABLE_SUFFIX)
DEX2OATD := $(HOST_OUT_EXECUTABLES)/dex2oatd$(HOST_EXECUTABLE_SUFFIX) else
DEX2OAT := $(HOST_OUT_EXECUTABLES)/dex2oatd$(HOST_EXECUTABLE_SUFFIX)
endif
# By default, do not run rerun dex2oat if the tool changes. # By default, do not run rerun dex2oat if the tool changes.
# Comment out the | to force dex2oat to rerun on after all changes. # Comment out the | to force dex2oat to rerun on after all changes.
@@ -13,9 +18,6 @@ DEX2OAT_DEPENDENCY += art/runtime/image.cc # dependency on image version number
DEX2OAT_DEPENDENCY += | DEX2OAT_DEPENDENCY += |
DEX2OAT_DEPENDENCY += $(DEX2OAT) DEX2OAT_DEPENDENCY += $(DEX2OAT)
DEX2OATD_DEPENDENCY := $(DEX2OAT_DEPENDENCY)
DEX2OATD_DEPENDENCY += $(DEX2OATD)
# Use the first preloaded-classes file in PRODUCT_COPY_FILES. # Use the first preloaded-classes file in PRODUCT_COPY_FILES.
PRELOADED_CLASSES := $(call word-colon,1,$(firstword \ PRELOADED_CLASSES := $(call word-colon,1,$(firstword \
$(filter %system/etc/preloaded-classes,$(PRODUCT_COPY_FILES)))) $(filter %system/etc/preloaded-classes,$(PRODUCT_COPY_FILES))))
@@ -24,13 +26,6 @@ PRELOADED_CLASSES := $(call word-colon,1,$(firstword \
COMPILED_CLASSES := $(call word-colon,1,$(firstword \ COMPILED_CLASSES := $(call word-colon,1,$(firstword \
$(filter %system/etc/compiled-classes,$(PRODUCT_COPY_FILES)))) $(filter %system/etc/compiled-classes,$(PRODUCT_COPY_FILES))))
# Default to debug version to help find bugs.
# Set USE_DEX2OAT_DEBUG to false for only building non-debug versions.
ifneq ($(USE_DEX2OAT_DEBUG), false)
DEX2OAT = $(DEX2OATD)
DEX2OAT_DEPENDENCY = $(DEX2OATD_DEPENDENCY)
endif
# start of image reserved address space # start of image reserved address space
LIBART_IMG_HOST_BASE_ADDRESS := 0x60000000 LIBART_IMG_HOST_BASE_ADDRESS := 0x60000000
LIBART_IMG_TARGET_BASE_ADDRESS := 0x70000000 LIBART_IMG_TARGET_BASE_ADDRESS := 0x70000000