diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-08-05 12:50:01 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-08-05 14:59:33 -0700 |
| commit | 18e74061b760389a94439f4b14acb376809a44ce (patch) | |
| tree | 8469af3cd939c433b857367c5655ac20d0556fcf /JavaLibrary.mk | |
| parent | a551992765186ad72cebe76a63cbefc7c6b188d7 (diff) | |
| download | libcore-18e74061b760389a94439f4b14acb376809a44ce.tar.gz libcore-18e74061b760389a94439f4b14acb376809a44ce.tar.bz2 libcore-18e74061b760389a94439f4b14acb376809a44ce.zip | |
Dalvik is dead, long live Dalvik!
croot
cd libcore
repo start dalvik-is-dead-long-live-dalvik .
repo sync -c .
git rm -r libdvm
git add JavaLibrary.mk (after removing libdvm references, adding explict core-libart references)
git add Docs.mk (after replacing references to libdvm with libart)
git add benchmarks/Android.mk (after adding explict core-libart references)
git add Android.mk (after removing dalvik-host target)
git commit -a -m 'Dalvik is dead, long live Dalvik!'
Bug: 14298175
Change-Id: I977e7b4be8ef1043b70ceb8532ac4947ea1b7ab8
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 8935b9a6e..ff0f6e9fd 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -62,7 +62,6 @@ ifneq ($(EMMA_INSTRUMENT_STATIC),true) endif endif -libdvm_core_src_files += $(common_core_src_files) $(call all-main-java-files-under,libdvm) libart_core_src_files += $(common_core_src_files) $(call all-main-java-files-under,libart) local_javac_flags=-encoding UTF-8 @@ -76,18 +75,6 @@ local_javac_flags+=-Xmaxwarns 9999999 # Definitions to make the core library. include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(libdvm_core_src_files) -LOCAL_JAVA_RESOURCE_DIRS := $(core_resource_dirs) -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVACFLAGS := $(local_javac_flags) -LOCAL_DX_FLAGS := --core-library -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := core -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk -LOCAL_REQUIRED_MODULES := tzdata -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) LOCAL_SRC_FILES := $(libart_core_src_files) LOCAL_JAVA_RESOURCE_DIRS := $(core_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true @@ -108,7 +95,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(test_src_files) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit okhttp +LOCAL_JAVA_LIBRARIES := bouncycastle core-libart core-junit okhttp LOCAL_STATIC_JAVA_LIBRARIES := core-tests-support sqlite-jdbc mockwebserver nist-pkix-tests LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_MODULE := core-tests @@ -122,7 +109,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-test-java-files-under,support) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit +LOCAL_JAVA_LIBRARIES := bouncycastle core-libart core-junit LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_MODULE := core-tests-support LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk @@ -135,7 +122,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-test-java-files-under, jsr166-tests) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core core-junit +LOCAL_JAVA_LIBRARIES := core-libart core-junit LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_MODULE := jsr166-tests LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk @@ -169,18 +156,6 @@ include $(BUILD_HOST_JAVA_LIBRARY) # Definitions to make the core library. include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(libdvm_core_src_files) -LOCAL_JAVA_RESOURCE_DIRS := $(core_resource_dirs) -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVACFLAGS := $(local_javac_flags) -LOCAL_DX_FLAGS := --core-library -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := core-hostdex -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk -LOCAL_REQUIRED_MODULES := tzdata-host -include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) - -include $(CLEAR_VARS) LOCAL_SRC_FILES := $(libart_core_src_files) LOCAL_JAVA_RESOURCE_DIRS := $(core_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true |