OSDN Git Service
(root)
/
android-x86
/
art.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2e87969
)
Move image classes options from art to AndroidRuntime [art]
author
Brian Carlstrom
<bdc@google.com>
Wed, 30 Jul 2014 22:13:25 +0000
(15:13 -0700)
committer
Brian Carlstrom
<bdc@google.com>
Wed, 30 Jul 2014 22:57:15 +0000
(15:57 -0700)
Bug:
15165413
Change-Id: I3dfa702ac29279cf76d4cc451138c03a5158ac3a
runtime/gc/space/image_space.cc
patch
|
blob
|
history
diff --git
a/runtime/gc/space/image_space.cc
b/runtime/gc/space/image_space.cc
index
883e1c1
..
5177cb9
100644
(file)
--- a/
runtime/gc/space/image_space.cc
+++ b/
runtime/gc/space/image_space.cc
@@
-101,10
+101,7
@@
static bool GenerateImage(const std::string& image_filename, std::string* error_
<< "art base address of 0x" << std::hex << ART_BASE_ADDRESS;
arg_vector.push_back(StringPrintf("--base=0x%x", ART_BASE_ADDRESS + base_offset));
- if (kIsTargetBuild) {
- arg_vector.push_back("--image-classes-zip=/system/framework/framework.jar");
- arg_vector.push_back("--image-classes=preloaded-classes");
- } else {
+ if (!kIsTargetBuild) {
arg_vector.push_back("--host");
}