diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-06-18 12:45:45 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-06-18 19:06:35 -0700 |
| commit | adb19b9b603ba83ba49b1a10b6301e396132bf3b (patch) | |
| tree | b41c1452d62f1c848212dd7ea50004ae68934238 /benchmarks | |
| parent | 1265f1c73c6ae3b03a973f048cdc8754ee87e026 (diff) | |
| download | libcore-adb19b9b603ba83ba49b1a10b6301e396132bf3b.tar.gz libcore-adb19b9b603ba83ba49b1a10b6301e396132bf3b.tar.bz2 libcore-adb19b9b603ba83ba49b1a10b6301e396132bf3b.zip | |
Dalvik is dead, long live Dalvik! DO NOT MERGE
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! DO NOT MERGE'
Bug: 14298175
Change-Id: I0e7a3ce47e0b6e3a7b15006a6d17d103d23e8064
Diffstat (limited to 'benchmarks')
| -rw-r--r-- | benchmarks/Android.mk | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk index b91894f14..c0a38a0a5 100644 --- a/benchmarks/Android.mk +++ b/benchmarks/Android.mk @@ -1,34 +1,39 @@ +# -*- mode: makefile -*- +# Copyright (C) 2013 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. + LOCAL_PATH:= $(call my-dir) -################################################## -include $(CLEAR_VARS) ifeq ($(LIBCORE_SKIP_TESTS),) -# Only compile source java files in this apk. -LOCAL_SRC_FILES := $(call all-java-files-under, src) +################################################## +include $(CLEAR_VARS) LOCAL_MODULE := benchmarks - -LOCAL_STATIC_JAVA_LIBRARIES := \ - caliper-prebuilt \ - core-tests - -LOCAL_JAVA_LIBRARIES := \ - bouncycastle \ - conscrypt \ - core - +LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_STATIC_JAVA_LIBRARIES := caliper-prebuilt core-tests +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_JAVA_LIBRARIES := core-libart conscrypt core-junit bouncycastle framework LOCAL_MODULE_TAGS := tests - LOCAL_MODULE_PATH := $(PRODUCT_OUT)/data/caliperperf - +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_JAVA_LIBRARY) ################################################## # Prebuilt Java libraries include $(CLEAR_VARS) - -LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \ - caliper-prebuilt:libs/caliper.jar - +LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := caliper-prebuilt:libs/caliper.jar +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_MULTI_PREBUILT) + endif |