Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
art
Commits
19e776ce
Commit
19e776ce
authored
11 years ago
by
Brian Carlstrom
Browse files
Options
Download
Email Patches
Plain Diff
Enable darwin target build for art.
Change-Id: I8fc04258360d663d2fcd07c307fdfdd2981cdd19
parent
4560248d
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
40 additions
and
37 deletions
+40
-37
Android.mk
Android.mk
+0
-9
build/Android.common.mk
build/Android.common.mk
+2
-2
build/Android.gtest.mk
build/Android.gtest.mk
+4
-2
build/Android.libarttest.mk
build/Android.libarttest.mk
+4
-2
compiler/Android.mk
compiler/Android.mk
+8
-6
dex2oat/Android.mk
dex2oat/Android.mk
+8
-6
oatdump/Android.mk
oatdump/Android.mk
+7
-5
runtime/Android.mk
runtime/Android.mk
+7
-5
No files found.
Android.mk
View file @
19e776ce
...
...
@@ -78,15 +78,6 @@ clean-oat-target:
adb shell
rm
system/app/
*
.odex
adb shell
rm
data/run-test/test-
*
/dalvik-cache/
*
@classes.dex
########################################################################
# darwin build
# we aren't building most of art on darwin right now, but we do need to build new dalvikvm
ifeq
($(HOST_OS),darwin)
art_dont_bother
:=
true
include
$(art_path)/dalvikvm/Android.mk
endif
ifneq
($(art_dont_bother),true)
########################################################################
...
...
This diff is collapsed.
Click to expand it.
build/Android.common.mk
View file @
19e776ce
...
...
@@ -25,8 +25,8 @@
#
ART_BUILD_TARGET_NDEBUG
?=
true
ART_BUILD_TARGET_DEBUG
?=
true
ART_BUILD_HOST_NDEBUG
?=
true
ART_BUILD_HOST_DEBUG
?=
true
ART_BUILD_HOST_NDEBUG
?=
$(WITH_HOST_DALVIK)
ART_BUILD_HOST_DEBUG
?=
$(WITH_HOST_DALVIK)
ifeq
($(ART_BUILD_TARGET_NDEBUG),false)
$(info
Disabling
ART_BUILD_TARGET_NDEBUG)
...
...
This diff is collapsed.
Click to expand it.
build/Android.gtest.mk
View file @
19e776ce
...
...
@@ -163,6 +163,8 @@ endef
ifeq
($(ART_BUILD_TARGET),true)
$(foreach
file,$(TEST_TARGET_SRC_FILES),
$(eval
$(call
build-art-test,target,$(file))))
endif
ifeq
($(ART_BUILD_HOST),true)
$(foreach
file,$(TEST_HOST_SRC_FILES),
$(eval
$(call
build-art-test,host,$(file))))
ifeq
($(WITH_HOST_DALVIK),true)
ifeq
($(ART_BUILD_HOST),true)
$(foreach
file,$(TEST_HOST_SRC_FILES),
$(eval
$(call
build-art-test,host,$(file))))
endif
endif
This diff is collapsed.
Click to expand it.
build/Android.libarttest.mk
View file @
19e776ce
...
...
@@ -64,6 +64,8 @@ endef
ifeq
($(ART_BUILD_TARGET),true)
$(eval
$(call
build-libarttest,target))
endif
ifeq
($(ART_BUILD_HOST),true)
$(eval
$(call
build-libarttest,host))
ifeq
($(WITH_HOST_DALVIK),true)
ifeq
($(ART_BUILD_HOST),true)
$(eval
$(call
build-libarttest,host))
endif
endif
This diff is collapsed.
Click to expand it.
compiler/Android.mk
View file @
19e776ce
...
...
@@ -221,12 +221,14 @@ endif
ifeq
($(ART_BUILD_TARGET_DEBUG),true)
$(eval
$(call
build-libart-compiler,target,debug))
endif
# We always build dex2oat and dependencies, even if the host build is otherwise disabled, since they are used to cross compile for the target.
ifeq
($(ART_BUILD_NDEBUG),true)
$(eval
$(call
build-libart-compiler,host,ndebug))
endif
ifeq
($(ART_BUILD_DEBUG),true)
$(eval
$(call
build-libart-compiler,host,debug))
ifeq
($(WITH_HOST_DALVIK),true)
# We always build dex2oat and dependencies, even if the host build is otherwise disabled, since they are used to cross compile for the target.
ifeq
($(ART_BUILD_NDEBUG),true)
$(eval
$(call
build-libart-compiler,host,ndebug))
endif
ifeq
($(ART_BUILD_DEBUG),true)
$(eval
$(call
build-libart-compiler,host,debug))
endif
endif
# Rule to build /system/lib/libcompiler_rt.a
...
...
This diff is collapsed.
Click to expand it.
dex2oat/Android.mk
View file @
19e776ce
...
...
@@ -28,10 +28,12 @@ ifeq ($(ART_BUILD_TARGET_DEBUG),true)
$(eval
$(call
build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libartd-compiler,art/compiler,target,debug))
endif
# We always build dex2oat and dependencies, even if the host build is otherwise disabled, since they are used to cross compile for the target.
ifeq
($(ART_BUILD_NDEBUG),true)
$(eval
$(call
build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libart-compiler,art/compiler,host,ndebug))
endif
ifeq
($(ART_BUILD_NDEBUG),true)
$(eval
$(call
build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libartd-compiler,art/compiler,host,debug))
ifeq
($(WITH_HOST_DALVIK),true)
# We always build dex2oat and dependencies, even if the host build is otherwise disabled, since they are used to cross compile for the target.
ifeq
($(ART_BUILD_NDEBUG),true)
$(eval
$(call
build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libart-compiler,art/compiler,host,ndebug))
endif
ifeq
($(ART_BUILD_NDEBUG),true)
$(eval
$(call
build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libartd-compiler,art/compiler,host,debug))
endif
endif
This diff is collapsed.
Click to expand it.
oatdump/Android.mk
View file @
19e776ce
...
...
@@ -28,9 +28,11 @@ ifeq ($(ART_BUILD_TARGET_DEBUG),true)
$(eval
$(call
build-art-executable,oatdump,$(OATDUMP_SRC_FILES),,,target,debug))
endif
ifeq
($(ART_BUILD_HOST_NDEBUG),true)
$(eval
$(call
build-art-executable,oatdump,$(OATDUMP_SRC_FILES),,,host,ndebug))
endif
ifeq
($(ART_BUILD_HOST_DEBUG),true)
$(eval
$(call
build-art-executable,oatdump,$(OATDUMP_SRC_FILES),,,host,debug))
ifeq
($(WITH_HOST_DALVIK),true)
ifeq
($(ART_BUILD_HOST_NDEBUG),true)
$(eval
$(call
build-art-executable,oatdump,$(OATDUMP_SRC_FILES),,,host,ndebug))
endif
ifeq
($(ART_BUILD_HOST_DEBUG),true)
$(eval
$(call
build-art-executable,oatdump,$(OATDUMP_SRC_FILES),,,host,debug))
endif
endif
This diff is collapsed.
Click to expand it.
runtime/Android.mk
View file @
19e776ce
...
...
@@ -366,9 +366,11 @@ ifeq ($(ART_BUILD_TARGET_DEBUG),true)
endif
# We always build dex2oat and dependencies, even if the host build is otherwise disabled, since they are used to cross compile for the target.
ifeq
($(ART_BUILD_NDEBUG),true)
$(eval
$(call
build-libart,host,ndebug))
endif
ifeq
($(ART_BUILD_DEBUG),true)
$(eval
$(call
build-libart,host,debug))
ifeq
($(WITH_HOST_DALVIK),true)
ifeq
($(ART_BUILD_NDEBUG),true)
$(eval
$(call
build-libart,host,ndebug))
endif
ifeq
($(ART_BUILD_DEBUG),true)
$(eval
$(call
build-libart,host,debug))
endif
endif
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment