diff options
author | Colin Cross <ccross@android.com> | 2016-07-12 00:49:16 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 00:49:16 +0000 |
commit | 2cb42e2caf08d109428a5a9c642eb7868734f5ad (patch) | |
tree | 0b7cb9be2ed3d1f228b3c9d1f363a51dd84ae908 /Android.mk | |
parent | 769544af4d0085c21c949e43c8f959be5a192434 (diff) | |
parent | 995696018e487ce51eee8bdc9399f9376b36efce (diff) | |
download | bzip2-2cb42e2caf08d109428a5a9c642eb7868734f5ad.tar.gz |
Merge \\\"Convert bzip Android.mk to Android.bp\\\" am: 539c57493a am: b0e77c4d65android-o-preview-1android-n-mr2-preview-2android-n-mr2-preview-1o-preview
am: 995696018e
Change-Id: I8372d487918e3fe910dd6b8f7870bdc80722d61f
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 3f4c418..0000000 --- a/Android.mk +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright (C) 2008 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) - -bzip_cflags := \ - -O3 \ - -DUSE_MMAP \ - -Wno-unused-parameter \ - -bzlib_files := \ - blocksort.c \ - bzlib.c \ - compress.c \ - crctable.c \ - decompress.c \ - huffman.c \ - randtable.c \ - -include $(CLEAR_VARS) -# measurements show that the ARM version of ZLib is about x1.17 faster -# than the thumb one... -LOCAL_ARM_MODE := arm -LOCAL_MODULE := libbz -LOCAL_CFLAGS += $(bzip_cflags) -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -ifeq ($(TARGET_ARCH),arm) - LOCAL_SDK_VERSION := 9 -endif -LOCAL_SRC_FILES := $(bzlib_files) -include $(BUILD_STATIC_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_CFLAGS += $(bzip_cflags) -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -LOCAL_MODULE := libbz -LOCAL_SRC_FILES := $(bzlib_files) -include $(BUILD_HOST_STATIC_LIBRARY) |