Add new build rules and associated fixes needed by perf.
New static libraries (host and target): libelf, libebl, libdw, and libdwfl
Cleaned up off_t, loff_t, and off64_t usage.
Change-Id: Ic567dce0591aad3c9c61f4054b2e1948b0865d64
diff --git a/Android.mk b/Android.mk
index 3a885fd..e790e1e 100755
--- a/Android.mk
+++ b/Android.mk
@@ -1,147 +1,15 @@
-LOCAL_PATH := $(call my-dir)
-
-supported_platforms := linux-x86 darwin-x86
-cur_platform := $(filter $(HOST_OS)-$(HOST_ARCH),$(supported_platforms))
-
-ifdef cur_platform
+# Copyright (C) 2012 The Android Open Source Project
#
-# host libelf
+# 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.
-include $(CLEAR_VARS)
-
-LIBELF_SRC_FILES := \
- libelf/elf32_checksum.c \
- libelf/elf32_fsize.c \
- libelf/elf32_getehdr.c \
- libelf/elf32_getphdr.c \
- libelf/elf32_getshdr.c \
- libelf/elf32_newehdr.c \
- libelf/elf32_newphdr.c \
- libelf/elf32_offscn.c \
- libelf/elf32_updatefile.c \
- libelf/elf32_updatenull.c \
- libelf/elf32_xlatetof.c \
- libelf/elf32_xlatetom.c \
- libelf/elf64_checksum.c \
- libelf/elf64_fsize.c \
- libelf/elf64_getehdr.c \
- libelf/elf64_getphdr.c \
- libelf/elf64_getshdr.c \
- libelf/elf64_newehdr.c \
- libelf/elf64_newphdr.c \
- libelf/elf64_offscn.c \
- libelf/elf64_updatefile.c \
- libelf/elf64_updatenull.c \
- libelf/elf64_xlatetof.c \
- libelf/elf64_xlatetom.c \
- libelf/elf_begin.c \
- libelf/elf_clone.c \
- libelf/elf_cntl.c \
- libelf/elf_end.c \
- libelf/elf_error.c \
- libelf/elf_fill.c \
- libelf/elf_flagdata.c \
- libelf/elf_flagehdr.c \
- libelf/elf_flagelf.c \
- libelf/elf_flagphdr.c \
- libelf/elf_flagscn.c \
- libelf/elf_flagshdr.c \
- libelf/elf_getarhdr.c \
- libelf/elf_getaroff.c \
- libelf/elf_getarsym.c \
- libelf/elf_getbase.c \
- libelf/elf_getdata.c \
- libelf/elf_getdata_rawchunk.c \
- libelf/elf_getident.c \
- libelf/elf_getscn.c \
- libelf/elf_getshnum.c \
- libelf/elf_getshstrndx.c \
- libelf/elf_gnu_hash.c \
- libelf/elf_hash.c \
- libelf/elf_kind.c \
- libelf/elf_memory.c \
- libelf/elf_ndxscn.c \
- libelf/elf_newdata.c \
- libelf/elf_newscn.c \
- libelf/elf_next.c \
- libelf/elf_nextscn.c \
- libelf/elf_rand.c \
- libelf/elf_rawdata.c \
- libelf/elf_rawfile.c \
- libelf/elf_readall.c \
- libelf/elf_scnshndx.c \
- libelf/elf_strptr.c \
- libelf/elf_update.c \
- libelf/elf_version.c \
- libelf/gelf_checksum.c \
- libelf/gelf_fsize.c \
- libelf/gelf_getauxv.c \
- libelf/gelf_getclass.c \
- libelf/gelf_getdyn.c \
- libelf/gelf_getehdr.c \
- libelf/gelf_getlib.c \
- libelf/gelf_getmove.c \
- libelf/gelf_getnote.c \
- libelf/gelf_getphdr.c \
- libelf/gelf_getrela.c \
- libelf/gelf_getrel.c \
- libelf/gelf_getshdr.c \
- libelf/gelf_getsym.c \
- libelf/gelf_getsyminfo.c \
- libelf/gelf_getsymshndx.c \
- libelf/gelf_getverdaux.c \
- libelf/gelf_getverdef.c \
- libelf/gelf_getvernaux.c \
- libelf/gelf_getverneed.c \
- libelf/gelf_getversym.c \
- libelf/gelf_newehdr.c \
- libelf/gelf_newphdr.c \
- libelf/gelf_offscn.c \
- libelf/gelf_update_auxv.c \
- libelf/gelf_update_dyn.c \
- libelf/gelf_update_ehdr.c \
- libelf/gelf_update_lib.c \
- libelf/gelf_update_move.c \
- libelf/gelf_update_phdr.c \
- libelf/gelf_update_rela.c \
- libelf/gelf_update_rel.c \
- libelf/gelf_update_shdr.c \
- libelf/gelf_update_sym.c \
- libelf/gelf_update_syminfo.c \
- libelf/gelf_update_symshndx.c \
- libelf/gelf_update_verdaux.c \
- libelf/gelf_update_verdef.c \
- libelf/gelf_update_vernaux.c \
- libelf/gelf_update_verneed.c \
- libelf/gelf_update_versym.c \
- libelf/gelf_xlate.c \
- libelf/gelf_xlatetof.c \
- libelf/gelf_xlatetom.c \
- libelf/libelf_crc32.c \
- libelf/libelf_next_prime.c \
- libelf/nlist.c
-
-LOCAL_SRC_FILES := $(LIBELF_SRC_FILES)
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/lib $(LOCAL_PATH)/libelf
-
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/host-$(HOST_OS)-fixup
-
-LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE
-
-# to suppress the "pointer of type ‘void *’ used in arithmetic" warning
-LOCAL_CFLAGS += -Wno-pointer-arith
-
-ifeq ($(HOST_OS),darwin)
- LOCAL_CFLAGS += -fnested-functions
-endif
-
-# to fix machine-dependent issues
-LOCAL_CFLAGS += -include $(LOCAL_PATH)/host-$(HOST_OS)-fixup/AndroidFixup.h
-
-LOCAL_MODULE := libelf
-
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-endif #cur_platform
+include $(call all-subdir-makefiles)