Working dex2oat and oatexec
adb shell dex2oatd --dex-file=/system/framework/core.jar --image=/system/framework/boot.oat --base=0x50000000 "'--method=Ljava/lang/System;logI(Ljava/lang/String;)V'" "'--method=Ljava/lang/System;log(CLjava/lang/String;Ljava/lang/Throwable;)V'"
adb shell dex2oatd --boot-dex-file=/system/framework/core.jar --boot=/system/framework/boot.oat --dex-file=/system/framework/art-test-dex-HelloWorld.jar --image=/system/framework/art-test-dex-HelloWorld.oat
adb shell oatexecd -Xbootclasspath:/system/framework/core.jar -Xbootimage:/system/framework/boot.oat -classpath /system/framework/art-test-dex-HelloWorld.jar -Ximage:/system/framework/art-test-dex-HelloWorld.oat HelloWorld
09-05 17:58:18.912 2385 2385 I System : Hello, world!
Change-Id: I53e534068584f0c3a837313e4d517a0e4a7154fc
diff --git a/build/Android.aexec.mk b/build/Android.aexec.mk
deleted file mode 100644
index 6d6177c..0000000
--- a/build/Android.aexec.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# $(1): target or host
-# $(2): ndebug or debug
-define build-aexec
- include $(CLEAR_VARS)
- ifeq ($(1),target)
- include external/stlport/libstlport.mk
- endif
- LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)
- ifeq ($(2),ndebug)
- LOCAL_MODULE := aexec
- else
- LOCAL_MODULE := aexecd
- endif
- LOCAL_MODULE_TAGS := optional
- LOCAL_SRC_FILES := $(AEXEC_SRC_FILES)
- LOCAL_CFLAGS := $(ART_CFLAGS)
- ifeq ($(2),debug)
- LOCAL_CFLAGS += -UNDEBUG
- endif
- LOCAL_SHARED_LIBRARIES := libnativehelper
- ifeq ($(2),ndebug)
- LOCAL_SHARED_LIBRARIES += libart
- else
- LOCAL_SHARED_LIBRARIES += libartd
- endif
- ifeq ($(1),target)
- LOCAL_SHARED_LIBRARIES += libstlport
- endif
- ifeq ($(1),target)
- include $(BUILD_EXECUTABLE)
- else
- include $(BUILD_HOST_EXECUTABLE)
- endif
-endef
-
-$(eval $(call build-aexec,target,ndebug))
-$(eval $(call build-aexec,target,debug))
-ifeq ($(WITH_HOST_DALVIK),true)
- $(eval $(call build-aexec,host,ndebug))
- $(eval $(call build-aexec,host,debug))
-endif
-
diff --git a/build/Android.common.mk b/build/Android.common.mk
index aa9b719..d7346db 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -35,8 +35,11 @@
-fno-align-jumps \
-fstrict-aliasing
-AEXEC_SRC_FILES := \
- src/main.cc
+DEX2OAT_SRC_FILES := \
+ src/dex2oat.cc
+
+OATEXEC_SRC_FILES := \
+ src/oatexec.cc
LIBART_COMMON_SRC_FILES := \
src/assembler.cc \
@@ -156,6 +159,7 @@
AllFields \
CreateMethodDescriptor \
Fibonacci \
+ HelloWorld \
IntMath \
Interfaces \
Main \
diff --git a/build/Android.executable.mk b/build/Android.executable.mk
new file mode 100644
index 0000000..328f60a
--- /dev/null
+++ b/build/Android.executable.mk
@@ -0,0 +1,76 @@
+#
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+ART_HOST_EXECUTABLES :=
+ART_TARGET_EXECUTABLES :=
+
+# $(1): executable ("d" will be appended for debug version)
+# $(2): source
+# $(3): target or host
+# $(4): ndebug or debug
+define build-art-executable
+ include $(CLEAR_VARS)
+ ifeq ($(3),target)
+ include external/stlport/libstlport.mk
+ endif
+ LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)
+ ifeq ($(4),ndebug)
+ LOCAL_MODULE := $(1)
+ else
+ LOCAL_MODULE := $(1)d
+ endif
+ LOCAL_MODULE_TAGS := optional
+ LOCAL_SRC_FILES := $(2)
+ LOCAL_CFLAGS := $(ART_CFLAGS)
+ ifeq ($(4),debug)
+ LOCAL_CFLAGS += -UNDEBUG
+ endif
+ LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
+ LOCAL_SHARED_LIBRARIES := libnativehelper
+ ifeq ($(4),ndebug)
+ LOCAL_SHARED_LIBRARIES += libart
+ else
+ LOCAL_SHARED_LIBRARIES += libartd
+ endif
+ ifeq ($(3),target)
+ LOCAL_SHARED_LIBRARIES += libstlport
+ endif
+ ifeq ($(3),target)
+ include $(BUILD_EXECUTABLE)
+ else
+ include $(BUILD_HOST_EXECUTABLE)
+ endif
+ ifeq ($(1),target)
+ ART_TARGET_EXECUTABLES += $(TARGET_OUT_EXECUTABLES)/$$(LOCAL_MODULE)
+ else
+ ART_HOST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$$(LOCAL_MODULE)
+ endif
+endef
+
+$(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),target,ndebug))
+$(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),target,debug))
+ifeq ($(WITH_HOST_DALVIK),true)
+ $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),host,ndebug))
+ $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),host,debug))
+endif
+
+$(eval $(call build-art-executable,oatexec,$(OATEXEC_SRC_FILES),target,ndebug))
+$(eval $(call build-art-executable,oatexec,$(OATEXEC_SRC_FILES),target,debug))
+ifeq ($(WITH_HOST_DALVIK),true)
+ $(eval $(call build-art-executable,oatexec,$(OATEXEC_SRC_FILES),host,ndebug))
+ $(eval $(call build-art-executable,oatexec,$(OATEXEC_SRC_FILES),host,debug))
+endif
+
diff --git a/build/Android.libart.mk b/build/Android.libart.mk
index 5877e2f..3218a42 100644
--- a/build/Android.libart.mk
+++ b/build/Android.libart.mk
@@ -37,7 +37,7 @@
ifeq ($(2),debug)
LOCAL_CFLAGS += -UNDEBUG
endif
- LOCAL_C_INCLUDES += src $(ART_C_INCLUDES)
+ LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
LOCAL_SHARED_LIBRARIES := liblog libnativehelper
ifeq ($(1),target)
LOCAL_SHARED_LIBRARIES += libcutils libstlport libz libdl