diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-07-12 23:42:50 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2011-07-13 10:32:00 -0700 |
| commit | 934486cf07c578b6494417ca5dcbae89cf04b019 (patch) | |
| tree | fce6df4c3daca71151052961ad6191f0b5854ffc /build/Android.libart.mk | |
| parent | b557353b22c728eecbd1c68593b482622c7782a8 (diff) | |
| download | art-934486cf07c578b6494417ca5dcbae89cf04b019.zip art-934486cf07c578b6494417ca5dcbae89cf04b019.tar.gz art-934486cf07c578b6494417ca5dcbae89cf04b019.tar.bz2 | |
Make ClassLinker set Class::super_class_ plus test and build improvements
Create placeholder ClassLinker::java_lang_Object_ for use a
super-class of java_lang_Class_ instances.
src/class_linker.cc
src/class_linker.h
Expand ClassLinker FindClass test to verify Class::GetSuperClass
src/class_linker_test.cc
Move DexFile::Load* methods to ClassLinker so they can reference
java_lang_Object_ and java_lang_Class_
src/class_linker.cc
src/class_linker.h
src/dex_file.cc
src/dex_file.h
Move corresponding Load tests from class_linker_test to dex_file_test
src/class_linker_test.cc
src/dex_file_test.cc
Tracking change to object_test to use ClassLinker::Load* methods
src/object_test.cc
Move base64 to new src/common_test.h for reuse accross tests. Add
missing example source for MyClass dex.
src/common_test.h
src/class_linker_test.cc
src/dex_file_test.cc
src/object_test.cc
Change Heap::AllocClass to take DexFile argument
src/heap.h
Remove Method::dex_file_ in favor of using Method::GetClass::GetDexFile
src/object.cc
src/object.h
Made a few more RawDexFile methods const
src/raw_dex_file.cc
src/raw_dex_file.h
Add convenience targets for build-art and test-art-host
Android.mk
Drop use of _LOCAL_ from make variants, which isn't the appropriate
here, where we aren't differentiating between LOCAL_ and PRIVATE_.
Avoid redefinition of variables based on now removed
LIBART_TARGET_ARCH and TEST_TARGET_ARCH to support phony targets in
Android.mk
build/Android.aexec.host.mk
build/Android.aexec.mk
build/Android.common.mk
build/Android.libart.host.mk
build/Android.libart.mk
build/Android.test.host.mk
build/Android.test.mk
Change-Id: I84ce2b7a2b4e37799d4d782b97c02d5e97ac081c
Diffstat (limited to 'build/Android.libart.mk')
| -rw-r--r-- | build/Android.libart.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/build/Android.libart.mk b/build/Android.libart.mk index 404f0c6..e9dcfb6 100644 --- a/build/Android.libart.mk +++ b/build/Android.libart.mk @@ -19,9 +19,8 @@ include $(CLEAR_VARS) LOCAL_MODULE := libart LOCAL_MODULE_TAGS := optional -LIBART_TARGET_ARCH := $(TARGET_ARCH) include $(build_path)/Android.common.mk -LOCAL_SRC_FILES := $(LIBART_LOCAL_SRC_FILES) +LOCAL_SRC_FILES := $(LIBART_TARGET_SRC_FILES) include external/stlport/libstlport.mk |