diff options
| author | Colin Cross <ccross@android.com> | 2016-08-30 13:49:26 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2016-09-08 11:00:53 -0700 |
| commit | fe6064ae8b861f1290aa793ce0de219781da6a10 (patch) | |
| tree | a24da585adbafc5932e4c3aab07f0e1d9a639628 /dexdump | |
| parent | 090a5da3a7f320b9d2aa9fa461efc11a7eb39392 (diff) | |
| download | android_art-fe6064ae8b861f1290aa793ce0de219781da6a10.tar.gz android_art-fe6064ae8b861f1290aa793ce0de219781da6a10.tar.bz2 android_art-fe6064ae8b861f1290aa793ce0de219781da6a10.zip | |
Convert more of art to Android.bp
Relanding I1b10f140e17dd5e12a9d7f6a29d47cf61f5bf6ef, with fixes to
compile dalvikvm32 and dalvikvm64, and add them as dependencies of
tests. Also fixes HOST_PREFER_32_BIT by moving the override from the
defaults, which are not used by everything in art, to the art_cc_binary
module type.
Test: rm -rf out/host; m -j HOST_PREFER_32_BIT test-art-host; m -j test-art-host
Change-Id: I64d3eef5080e128103d052497760c3521cc253c6
Diffstat (limited to 'dexdump')
| -rw-r--r-- | dexdump/Android.bp | 26 | ||||
| -rwxr-xr-x | dexdump/Android.mk | 52 |
2 files changed, 26 insertions, 52 deletions
diff --git a/dexdump/Android.bp b/dexdump/Android.bp new file mode 100644 index 0000000000..e77f809d4b --- /dev/null +++ b/dexdump/Android.bp @@ -0,0 +1,26 @@ +// Copyright (C) 2015 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. + +// TODO(ajcbik): rename dexdump2 into dexdump when Dalvik version is removed + +art_cc_binary { + name: "dexdump2", + host_supported: true, + srcs: [ + "dexdump_main.cc", + "dexdump.cc", + ], + cflags: ["-Wall"], + shared_libs: ["libart"], +} diff --git a/dexdump/Android.mk b/dexdump/Android.mk deleted file mode 100755 index ec2529e18f..0000000000 --- a/dexdump/Android.mk +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright (C) 2015 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. - -# TODO(ajcbik): Art-i-fy this makefile - -# TODO(ajcbik): rename dexdump2 into dexdump when Dalvik version is removed - -LOCAL_PATH:= $(call my-dir) - -dexdump_src_files := dexdump_main.cc dexdump.cc -dexdump_c_includes := art/runtime -dexdump_libraries := libart - -## -## Build the device command line tool dexdump. -## - -ifneq ($(SDK_ONLY),true) # SDK_only doesn't need device version -include $(CLEAR_VARS) -LOCAL_CPP_EXTENSION := cc -LOCAL_SRC_FILES := $(dexdump_src_files) -LOCAL_C_INCLUDES := $(dexdump_c_includes) -LOCAL_CFLAGS += -Wall -LOCAL_SHARED_LIBRARIES += $(dexdump_libraries) -LOCAL_MODULE := dexdump2 -include $(BUILD_EXECUTABLE) -endif # !SDK_ONLY - -## -## Build the host command line tool dexdump. -## - -include $(CLEAR_VARS) -LOCAL_CPP_EXTENSION := cc -LOCAL_SRC_FILES := $(dexdump_src_files) -LOCAL_C_INCLUDES := $(dexdump_c_includes) -LOCAL_CFLAGS += -Wall -LOCAL_SHARED_LIBRARIES += $(dexdump_libraries) -LOCAL_MODULE := dexdump2 -LOCAL_MULTILIB := $(ART_MULTILIB_OVERRIDE_host) -include $(BUILD_HOST_EXECUTABLE) |