Fix Object::IsSoftReference
Also changed -Xzygote to default boot.art and log arguments
Finally Makefile work:
- separate out test dependencies
- changed zygote with art to work by replacing libdvm with libart[d]
- changed Makefile defines to name and error check their arguments
This was to fix bug in generating ART_TARGET_EXECUTABLES
where we used $(1) when we meant $(3)
Change-Id: I7ef6008eff1fe99b59d151b6793e8fd8ea5304d4
diff --git a/Android.mk b/Android.mk
index 0503f8c..e9bc1df 100644
--- a/Android.mk
+++ b/Android.mk
@@ -57,8 +57,11 @@
$(foreach file,$(sort $(ART_HOST_TEST_EXECUTABLES)),$(1) $(file) &&) true
endef
-ART_HOST_TEST_DEPENDENCIES := $(ART_HOST_EXECUTABLES) $(ART_HOST_TEST_EXECUTABLES) $(ANDROID_HOST_OUT)/framework/core-hostdex.jar $(ART_TEST_OAT_FILES)
-ART_TARGET_TEST_DEPENDENCIES := $(ART_TARGET_EXECUTABLES) $(ART_TARGET_TEST_EXECUTABLES) $(ANDROID_PRODUCT_OUT)/system/framework/core.jar $(ART_TEST_OAT_FILES)
+ART_HOST_DEPENDENCIES := $(ART_HOST_EXECUTABLES) $(ANDROID_HOST_OUT)/framework/core-hostdex.jar
+ART_TARGET_DEPENDENCIES := $(ART_TARGET_EXECUTABLES) $(ANDROID_PRODUCT_OUT)/system/framework/core.jar
+
+ART_HOST_TEST_DEPENDENCIES := $(ART_HOST_DEPENDENCIES) $(ART_TEST_OAT_FILES)
+ART_TARGET_TEST_DEPENDENCIES := $(ART_TARGET_DEPENDENCIES) $(ART_TEST_OAT_FILES)
ART_TARGET_TEST_DEPENDENCIES += $(TARGET_OUT_EXECUTABLES)/oat_process $(TARGET_OUT_EXECUTABLES)/oat_processd
@@ -165,20 +168,34 @@
########################################################################
# zygote targets
#
-# zygote-oat-process will change to use art to boot the device
-# zygote-app-process will restore to booting with dalvik
+# zygote-artd will change to use art to boot the device with a debug build
+# zygote-art will change to use art to boot the device with a production build
+# zygote-dalvik will restore to booting with dalvik
+#
+# zygote-artd-target-sync will just push a new artd in place of dvm
+# zygote-art-target-sync will just push a new art in place of dvm
-.PHONY: zygote-oat-process
-zygote-oat-process: $(TARGET_BOOT_OAT) test-art-target-sync
- sed -e 's/app_process/oat_process/' -e 's/--start-system-server/--start-system-server --no-preload/' < system/core/rootdir/init.rc > $(ANDROID_PRODUCT_OUT)/root/init.rc
+.PHONY: zygote-artd-target-sync
+zygote-artd-target-sync: $(ART_TARGET_DEPENDENCIES)
+ cp $(ANDROID_PRODUCT_OUT)/system/lib/libartd.so $(ANDROID_PRODUCT_OUT)/system/lib/libdvm.so
+ cp $(ANDROID_PRODUCT_OUT)/symbols/system/lib/libartd.so $(ANDROID_PRODUCT_OUT)/symbols/system/lib/libdvm.so
+ adb remount
+ adb sync
+
+zygote-artd: $(TARGET_BOOT_OAT) zygote-artd-target-sync
+ sed 's/--start-system-server/--start-system-server --no-preload/' < system/core/rootdir/init.rc > $(ANDROID_PRODUCT_OUT)/root/init.rc
rm -f $(ANDROID_PRODUCT_OUT)/boot.img
unset ONE_SHOT_MAKEFILE && $(MAKE) showcommands bootimage
adb reboot bootloader
fastboot flash boot $(ANDROID_PRODUCT_OUT)/boot.img
fastboot reboot
-.PHONY: zygote-app-process
-zygote-app-process:
+.PHONY: zygote-dalvik
+zygote-dalvik:
+ cp $(ANDROID_PRODUCT_OUT)/obj/lib/libdvm.so $(ANDROID_PRODUCT_OUT)/system/lib/libdvm.so
+ cp $(ANDROID_PRODUCT_OUT)/obj/SHARED_LIBRARIES/libdvm_intermediates/LINKED/libdvm.so $(ANDROID_PRODUCT_OUT)/symbols/system/lib/libdvm.so
+ adb remount
+ adb sync
cp system/core/rootdir/init.rc $(ANDROID_PRODUCT_OUT)/root/init.rc
rm -f $(ANDROID_PRODUCT_OUT)/boot.img
unset ONE_SHOT_MAKEFILE && $(MAKE) showcommands bootimage
diff --git a/build/Android.executable.mk b/build/Android.executable.mk
index 3311b99..7619f74 100644
--- a/build/Android.executable.mk
+++ b/build/Android.executable.mk
@@ -22,50 +22,69 @@
# $(3): target or host
# $(4): ndebug or debug
define build-art-executable
+ ifneq ($(3),target)
+ ifneq ($(3),host)
+ $$(error expected target or host for argument 3, received $(3))
+ endif
+ endif
+ ifneq ($(4),ndebug)
+ ifneq ($(4),debug)
+ $$(error expected ndebug or debug for argument 4, received $(4))
+ endif
+ endif
+
+ art_executable := $(1)
+ art_source := $(2)
+ art_target_or_host := $(3)
+ art_ndebug_or_debug := $(4)
+
include $(CLEAR_VARS)
- ifeq ($(3),target)
+ ifeq ($$(art_target_or_host),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)
- ifeq ($(3),target)
- LOCAL_CFLAGS := $(ART_TARGET_CFLAGS)
- else
- LOCAL_CFLAGS := $(ART_HOST_CFLAGS)
+ LOCAL_SRC_FILES := $$(art_source)
+ LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
+ LOCAL_SHARED_LIBRARIES := libnativehelper
+
+ ifeq ($$(art_ndebug_or_debug),ndebug)
+ LOCAL_MODULE := $$(art_executable)
+ else #debug
+ LOCAL_MODULE := $$(art_executable)d
endif
- ifeq ($(4),debug)
- ifeq ($(3),target)
+
+ ifeq ($(art_target_or_host),target)
+ LOCAL_CFLAGS := $(ART_TARGET_CFLAGS)
+ ifeq ($$(art_ndebug_or_debug),debug)
LOCAL_CFLAGS += $(ART_TARGET_DEBUG_CFLAGS)
- else
+ endif
+ else # host
+ LOCAL_CFLAGS := $(ART_HOST_CFLAGS)
+ ifeq ($$(art_ndebug_or_debug),debug)
LOCAL_CFLAGS += $(ART_HOST_DEBUG_CFLAGS)
endif
endif
- LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
- LOCAL_SHARED_LIBRARIES := libnativehelper
- ifeq ($(4),ndebug)
+
+ ifeq ($$(art_ndebug_or_debug),ndebug)
LOCAL_SHARED_LIBRARIES += libart
- else
+ else # debug
LOCAL_SHARED_LIBRARIES += libartd
endif
- ifeq ($(3),target)
+
+ ifeq ($$(art_target_or_host),target)
LOCAL_SHARED_LIBRARIES += libstlport
endif
- ifeq ($(3),target)
+
+ ifeq ($$(art_target_or_host),target)
include $(BUILD_EXECUTABLE)
- else
+ ART_TARGET_EXECUTABLES := $(ART_TARGET_EXECUTABLES) $(TARGET_OUT_EXECUTABLES)/$$(LOCAL_MODULE)
+ else # host
include $(BUILD_HOST_EXECUTABLE)
+ ART_HOST_EXECUTABLES := $(ART_HOST_EXECUTABLES) $(HOST_OUT_EXECUTABLES)/$$(LOCAL_MODULE)
endif
- ifeq ($(1),target)
- ART_TARGET_EXECUTABLES += $(TARGET_OUT_EXECUTABLES)/$$(LOCAL_MODULE)
- else
- ART_HOST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$$(LOCAL_MODULE)
- endif
+
endef
ifeq ($(ART_BUILD_TARGET_NDEBUG),true)
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index e35758d..92443be 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -18,37 +18,43 @@
ART_TARGET_TEST_EXECUTABLES :=
# $(1): target or host
-# $(2): file name with .cc or .cc.arm extension
+# $(2): file name
define build-art-test
+ ifneq ($(1),target)
+ ifneq ($(1),host)
+ $$(error expected target or host for argument 1, received $(1))
+ endif
+ endif
+
+ art_target_or_host := $(1)
+ art_gtest_filename := $(2)
+
include $(CLEAR_VARS)
- ifeq ($(1),target)
+ ifeq ($$(art_target_or_host),target)
include external/stlport/libstlport.mk
endif
+
LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)
- LOCAL_MODULE := $(notdir $(basename $(2:%.arm=%)))
+ LOCAL_MODULE := $(notdir $(basename $$(art_gtest_filename)))
LOCAL_MODULE_TAGS := tests
- LOCAL_SRC_FILES := $(2)
+ LOCAL_SRC_FILES := $$(art_gtest_filename)
LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
LOCAL_SHARED_LIBRARIES := libarttest libartd
- ifeq ($(1),target)
+
+ ifeq ($$(art_target_or_host),target)
LOCAL_CFLAGS := $(ART_TARGET_CFLAGS) $(ART_TARGET_DEBUG_CFLAGS)
LOCAL_SHARED_LIBRARIES += libdl libicuuc libicui18n libnativehelper libstlport libz
LOCAL_STATIC_LIBRARIES := libgtest libgtest_main
- else
+ include $(BUILD_EXECUTABLE)
+ ART_TARGET_TEST_EXECUTABLES += $(TARGET_OUT_EXECUTABLES)/$$(LOCAL_MODULE)
+ else # host
LOCAL_CFLAGS := $(ART_HOST_CFLAGS) $(ART_HOST_DEBUG_CFLAGS)
LOCAL_SHARED_LIBRARIES += libicuuc-host libicui18n-host libnativehelper libz-host
LOCAL_WHOLE_STATIC_LIBRARIES := libgtest_main_host
- endif
- ifeq ($(1),target)
- include $(BUILD_EXECUTABLE)
- else
include $(BUILD_HOST_EXECUTABLE)
- endif
- ifeq ($(1),target)
- ART_TARGET_TEST_EXECUTABLES += $(TARGET_OUT_EXECUTABLES)/$$(LOCAL_MODULE)
- else
ART_HOST_TEST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$$(LOCAL_MODULE)
endif
+
endef
ifeq ($(ART_BUILD_TARGET),true)
diff --git a/build/Android.libart.mk b/build/Android.libart.mk
index b58d8e8..6c33512 100644
--- a/build/Android.libart.mk
+++ b/build/Android.libart.mk
@@ -17,47 +17,62 @@
# $(1): target or host
# $(2): ndebug or debug
define build-libart
+ ifneq ($(1),target)
+ ifneq ($(1),host)
+ $$(error expected target or host for argument 1, received $(1))
+ endif
+ endif
+ ifneq ($(2),ndebug)
+ ifneq ($(2),debug)
+ $$(error expected ndebug or debug for argument 2, received $(2))
+ endif
+ endif
+
+ art_target_or_host := $(1)
+ art_ndebug_or_debug := $(2)
+
include $(CLEAR_VARS)
- ifeq ($(1),target)
+ ifeq ($$(art_target_or_host),target)
include external/stlport/libstlport.mk
endif
LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)
- ifeq ($(2),ndebug)
+ ifeq ($$(art_ndebug_or_debug),ndebug)
LOCAL_MODULE := libart
- else
+ else # debug
LOCAL_MODULE := libartd
endif
+
LOCAL_MODULE_TAGS := optional
- ifeq ($(1),target)
+ ifeq ($$(art_target_or_host),target)
LOCAL_SRC_FILES := $(LIBART_TARGET_SRC_FILES)
- else
+ else # host
LOCAL_SRC_FILES := $(LIBART_HOST_SRC_FILES)
endif
- ifeq ($(1),target)
+ ifeq ($$(art_target_or_host),target)
LOCAL_CFLAGS := $(ART_TARGET_CFLAGS)
- else
+ else # host
LOCAL_CFLAGS := $(ART_HOST_CFLAGS)
endif
- ifeq ($(2),debug)
- ifeq ($(1),target)
+ ifeq ($$(art_ndebug_or_debug),debug)
+ ifeq ($$(art_target_or_host),target)
LOCAL_CFLAGS += $(ART_TARGET_DEBUG_CFLAGS)
- else
+ else # host
LOCAL_CFLAGS += $(ART_HOST_DEBUG_CFLAGS)
LOCAL_STATIC_LIBRARIES := libgtest_host
endif
endif
LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
LOCAL_SHARED_LIBRARIES := liblog libnativehelper
- ifeq ($(1),target)
+ ifeq ($$(art_target_or_host),target)
LOCAL_SHARED_LIBRARIES += libcutils libstlport libz libdl
- else
+ else # host
LOCAL_SHARED_LIBRARIES += libz-host
LOCAL_LDLIBS := -ldl -lpthread -lrt
endif
LOCAL_STATIC_LIBRARIES += libdex
- ifeq ($(1),target)
+ ifeq ($$(art_target_or_host),target)
include $(BUILD_SHARED_LIBRARY)
- else
+ else # host
include $(BUILD_HOST_SHARED_LIBRARY)
endif
endef
diff --git a/build/Android.libarttest.mk b/build/Android.libarttest.mk
index 823f78e..86927c3 100644
--- a/build/Android.libarttest.mk
+++ b/build/Android.libarttest.mk
@@ -16,27 +16,33 @@
# $(1): target or host
define build-libarttest
+ ifneq ($(1),target)
+ ifneq ($(1),host)
+ $$(error expected target or host for argument 1, received $(1))
+ endif
+ endif
+
+ art_target_or_host := $(1)
+
include $(CLEAR_VARS)
- ifeq ($(1),target)
+ ifeq ($$(art_target_or_host),target)
include external/stlport/libstlport.mk
endif
+
LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)
LOCAL_MODULE := libarttest
LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(LIBARTTEST_COMMON_SRC_FILES)
LOCAL_SHARED_LIBRARIES := libartd
- ifeq ($(1),target)
+ LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
+ ifeq ($$(art_target_or_host),target)
LOCAL_CFLAGS := $(ART_TARGET_CFLAGS) $(ART_TARGET_DEBUG_CFLAGS)
LOCAL_SHARED_LIBRARIES += libdl libstlport
LOCAL_STATIC_LIBRARIES := libgtest
- else
+ include $(BUILD_SHARED_LIBRARY)
+ else # host
LOCAL_CFLAGS := $(ART_HOST_CFLAGS) $(ART_HOST_DEBUG_CFLAGS)
LOCAL_LDLIBS := -ldl -lrt -lpthread
- endif
- LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
- ifeq ($(1),target)
- include $(BUILD_SHARED_LIBRARY)
- else
include $(BUILD_HOST_SHARED_LIBRARY)
endif
endef
diff --git a/oat_process/app_main.cpp b/oat_process/app_main.cpp
index 62858dc..978fd31 100644
--- a/oat_process/app_main.cpp
+++ b/oat_process/app_main.cpp
@@ -7,10 +7,8 @@
#define LOG_TAG "appproc"
-#include "class_loader.h"
-#include "jni_internal.h"
#include "stringprintf.h"
-#include "thread.h"
+#include "logging.h"
#include <binder/IPCThreadState.h>
#include <binder/ProcessState.h>
diff --git a/src/mark_sweep.cc b/src/mark_sweep.cc
index 79597ec..6512aef 100644
--- a/src/mark_sweep.cc
+++ b/src/mark_sweep.cc
@@ -269,7 +269,7 @@
} else if (klass->IsPhantomReferenceClass()) {
list = &phantom_reference_list_;
}
- DCHECK(list != NULL);
+ DCHECK(list != NULL) << PrettyClass(klass) << " " << std::hex << klass->GetAccessFlags();
Heap::EnqueuePendingReference(obj, list);
}
}
diff --git a/src/object.h b/src/object.h
index 4a7d4bb..c8f4375 100644
--- a/src/object.h
+++ b/src/object.h
@@ -1369,7 +1369,7 @@
}
bool IsSoftReferenceClass() const {
- return (GetAccessFlags() & ~kAccReferenceFlagsMask) == kAccClassIsReference;
+ return (GetAccessFlags() & kAccReferenceFlagsMask) == kAccClassIsReference;
}
bool IsFinalizerReferenceClass() const {
diff --git a/src/runtime.cc b/src/runtime.cc
index 4f74c67..30fb4de 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -217,7 +217,7 @@
for (size_t i = 0; i < options.size(); ++i) {
const StringPiece& option = options[i].first;
- if (false) {
+ if (true && options[0].first == "-Xzygote") {
LOG(INFO) << "option[" << i << "]=" << option;
}
if (option.starts_with("-Xbootclasspath:")) {
@@ -275,6 +275,7 @@
parsed->jni_trace_ = option.substr(strlen("-Xjnitrace:")).data();
} else if (option == "-Xzygote") {
parsed->is_zygote_ = true;
+ parsed->images_.push_back("/system/framework/boot.art");
} else if (option.starts_with("-verbose:")) {
std::vector<std::string> verbose_options;
Split(option.substr(strlen("-verbose:")).data(), ',', verbose_options);
diff --git a/src/thread.cc b/src/thread.cc
index 7eec6f3..cb71dcf 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -158,7 +158,6 @@
void Thread::InitAfterFork() {
InitTid();
- InitPthread();
InitPthreadKeySelf();
}