diff options
author | Colin Cross <ccross@android.com> | 2016-07-14 19:45:24 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-14 19:45:24 +0000 |
commit | f1f212563ee672a1eca4238a5cc6ff1e969ec071 (patch) | |
tree | c9c50889467efd60e1b24ae8be00ed62a0a953a0 | |
parent | 8890a15558f152307a2e24158effd0a89aba0439 (diff) | |
parent | 2ed2550b8595fde721dbc6a12091609a598192af (diff) | |
download | elfutils-android-vts-8.0_r6.tar.gz |
Merge \\\\"Convert libelf from Android.mk to Android.bp\\\\" am: adc7fa7b8e am: 7ece9f0c0f am: f7d84e6703android-wear-o-preview-4android-wear-o-preview-3android-wear-8.1.0_r1android-wear-8.0.0_r2android-wear-8.0.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-o-preview-4android-o-preview-3android-o-preview-2android-o-preview-1android-o-mr1-preview-2android-o-mr1-preview-1android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-o-mr1-iot-preview-6android-o-iot-preview-5android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r34android-8.0.0_r33android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releasesecurity-oc-mr1-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-iot-releaseoreo-mr1-devoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-mr1-1.2-iot-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devoreo-cts-releaseo-preview-4o-preview-3o-preview-2o-previewo-mr1-iot-preview-8o-mr1-iot-preview-7o-mr1-iot-preview-6o-iot-preview-5
am: 2ed2550b85
Change-Id: I01bb29357af82c325f18f8d56c9106bd2e5d9621
-rw-r--r-- | Android.bp | 15 | ||||
-rwxr-xr-x | Android.mk | 15 | ||||
-rw-r--r-- | libelf/Android.bp | 163 | ||||
-rwxr-xr-x | libelf/Android.mk | 190 |
4 files changed, 178 insertions, 205 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 00000000..754a6d72 --- /dev/null +++ b/Android.bp @@ -0,0 +1,15 @@ +cc_library_static { + name: "libelf_headers", + host_supported: true, + export_include_dirs: [ + ".", + "lib", + ], + target: { + android: { + export_include_dirs: ["bionic-fixup"], + }, + }, +} + +subdirs = ["libelf"] diff --git a/Android.mk b/Android.mk deleted file mode 100755 index 260fae21..00000000 --- a/Android.mk +++ /dev/null @@ -1,15 +0,0 @@ -# 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. - -include $(call all-subdir-makefiles) diff --git a/libelf/Android.bp b/libelf/Android.bp new file mode 100644 index 00000000..4f8fd03d --- /dev/null +++ b/libelf/Android.bp @@ -0,0 +1,163 @@ +// 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. + +cc_library_static { + name: "libelf", + host_supported: true, + + srcs: [ + "elf32_checksum.c", + "elf32_fsize.c", + "elf32_getchdr.c", + "elf32_getehdr.c", + "elf32_getphdr.c", + "elf32_getshdr.c", + "elf32_newehdr.c", + "elf32_newphdr.c", + "elf32_offscn.c", + "elf32_updatefile.c", + "elf32_updatenull.c", + "elf32_xlatetof.c", + "elf32_xlatetom.c", + "elf64_checksum.c", + "elf64_fsize.c", + "elf64_getchdr.c", + "elf64_getehdr.c", + "elf64_getphdr.c", + "elf64_getshdr.c", + "elf64_newehdr.c", + "elf64_newphdr.c", + "elf64_offscn.c", + "elf64_updatefile.c", + "elf64_updatenull.c", + "elf64_xlatetof.c", + "elf64_xlatetom.c", + "elf_begin.c", + "elf_clone.c", + "elf_cntl.c", + "elf_compress.c", + "elf_end.c", + "elf_error.c", + "elf_fill.c", + "elf_flagdata.c", + "elf_flagehdr.c", + "elf_flagelf.c", + "elf_flagphdr.c", + "elf_flagscn.c", + "elf_flagshdr.c", + "elf_getarhdr.c", + "elf_getaroff.c", + "elf_getarsym.c", + "elf_getbase.c", + "elf_getdata.c", + "elf_getdata_rawchunk.c", + "elf_getident.c", + "elf_getphdrnum.c", + "elf_getscn.c", + "elf_getshdrnum.c", + "elf_getshdrstrndx.c", + "elf_gnu_hash.c", + "elf_hash.c", + "elf_kind.c", + "elf_memory.c", + "elf_ndxscn.c", + "elf_newdata.c", + "elf_newscn.c", + "elf_next.c", + "elf_nextscn.c", + "elf_rand.c", + "elf_rawdata.c", + "elf_rawfile.c", + "elf_readall.c", + "elf_scnshndx.c", + "elf_strptr.c", + "elf_update.c", + "elf_version.c", + "gelf_checksum.c", + "gelf_fsize.c", + "gelf_getauxv.c", + "gelf_getchdr.c", + "gelf_getclass.c", + "gelf_getdyn.c", + "gelf_getehdr.c", + "gelf_getlib.c", + "gelf_getmove.c", + "gelf_getnote.c", + "gelf_getphdr.c", + "gelf_getrela.c", + "gelf_getrel.c", + "gelf_getshdr.c", + "gelf_getsym.c", + "gelf_getsyminfo.c", + "gelf_getsymshndx.c", + "gelf_getverdaux.c", + "gelf_getverdef.c", + "gelf_getvernaux.c", + "gelf_getverneed.c", + "gelf_getversym.c", + "gelf_newehdr.c", + "gelf_newphdr.c", + "gelf_offscn.c", + "gelf_update_auxv.c", + "gelf_update_dyn.c", + "gelf_update_ehdr.c", + "gelf_update_lib.c", + "gelf_update_move.c", + "gelf_update_phdr.c", + "gelf_update_rela.c", + "gelf_update_rel.c", + "gelf_update_shdr.c", + "gelf_update_sym.c", + "gelf_update_syminfo.c", + "gelf_update_symshndx.c", + "gelf_update_verdaux.c", + "gelf_update_verdef.c", + "gelf_update_vernaux.c", + "gelf_update_verneed.c", + "gelf_update_versym.c", + "gelf_xlate.c", + "gelf_xlatetof.c", + "gelf_xlatetom.c", + "libelf_crc32.c", + "libelf_next_prime.c", + "nlist.c", + ], + + cflags: [ + "-DHAVE_CONFIG_H", + "-std=gnu99", + "-D_GNU_SOURCE", + // to suppress the "pointer of type ‘void *’ used in arithmetic" warning + "-Wno-pointer-arith", + ], + + static_libs: [ + "libz", + "libelf_headers", + ], + + export_include_dirs: ["."], + + target: { + darwin: { + enabled: false, + }, + android: { + cflags: [ + "-D_FILE_OFFSET_BITS=64", + "-include AndroidFixup.h", + ], + }, + }, +} diff --git a/libelf/Android.mk b/libelf/Android.mk deleted file mode 100755 index 6bc31d6e..00000000 --- a/libelf/Android.mk +++ /dev/null @@ -1,190 +0,0 @@ -# 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) - -LIBELF_SRC_FILES := \ - elf32_checksum.c \ - elf32_fsize.c \ - elf32_getchdr.c \ - elf32_getehdr.c \ - elf32_getphdr.c \ - elf32_getshdr.c \ - elf32_newehdr.c \ - elf32_newphdr.c \ - elf32_offscn.c \ - elf32_updatefile.c \ - elf32_updatenull.c \ - elf32_xlatetof.c \ - elf32_xlatetom.c \ - elf64_checksum.c \ - elf64_fsize.c \ - elf64_getchdr.c \ - elf64_getehdr.c \ - elf64_getphdr.c \ - elf64_getshdr.c \ - elf64_newehdr.c \ - elf64_newphdr.c \ - elf64_offscn.c \ - elf64_updatefile.c \ - elf64_updatenull.c \ - elf64_xlatetof.c \ - elf64_xlatetom.c \ - elf_begin.c \ - elf_clone.c \ - elf_cntl.c \ - elf_compress.c \ - elf_end.c \ - elf_error.c \ - elf_fill.c \ - elf_flagdata.c \ - elf_flagehdr.c \ - elf_flagelf.c \ - elf_flagphdr.c \ - elf_flagscn.c \ - elf_flagshdr.c \ - elf_getarhdr.c \ - elf_getaroff.c \ - elf_getarsym.c \ - elf_getbase.c \ - elf_getdata.c \ - elf_getdata_rawchunk.c \ - elf_getident.c \ - elf_getphdrnum.c \ - elf_getscn.c \ - elf_getshdrnum.c \ - elf_getshdrstrndx.c \ - elf_gnu_hash.c \ - elf_hash.c \ - elf_kind.c \ - elf_memory.c \ - elf_ndxscn.c \ - elf_newdata.c \ - elf_newscn.c \ - elf_next.c \ - elf_nextscn.c \ - elf_rand.c \ - elf_rawdata.c \ - elf_rawfile.c \ - elf_readall.c \ - elf_scnshndx.c \ - elf_strptr.c \ - elf_update.c \ - elf_version.c \ - gelf_checksum.c \ - gelf_fsize.c \ - gelf_getauxv.c \ - gelf_getchdr.c \ - gelf_getclass.c \ - gelf_getdyn.c \ - gelf_getehdr.c \ - gelf_getlib.c \ - gelf_getmove.c \ - gelf_getnote.c \ - gelf_getphdr.c \ - gelf_getrela.c \ - gelf_getrel.c \ - gelf_getshdr.c \ - gelf_getsym.c \ - gelf_getsyminfo.c \ - gelf_getsymshndx.c \ - gelf_getverdaux.c \ - gelf_getverdef.c \ - gelf_getvernaux.c \ - gelf_getverneed.c \ - gelf_getversym.c \ - gelf_newehdr.c \ - gelf_newphdr.c \ - gelf_offscn.c \ - gelf_update_auxv.c \ - gelf_update_dyn.c \ - gelf_update_ehdr.c \ - gelf_update_lib.c \ - gelf_update_move.c \ - gelf_update_phdr.c \ - gelf_update_rela.c \ - gelf_update_rel.c \ - gelf_update_shdr.c \ - gelf_update_sym.c \ - gelf_update_syminfo.c \ - gelf_update_symshndx.c \ - gelf_update_verdaux.c \ - gelf_update_verdef.c \ - gelf_update_vernaux.c \ - gelf_update_verneed.c \ - gelf_update_versym.c \ - gelf_xlate.c \ - gelf_xlatetof.c \ - gelf_xlatetom.c \ - libelf_crc32.c \ - libelf_next_prime.c \ - nlist.c - -ifeq ($(HOST_OS),linux) - -# -# host libelf -# - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(LIBELF_SRC_FILES) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../lib \ - -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 - -LOCAL_MODULE := libelf - -LOCAL_STATIC_LIBRARIES := libz - -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) - -include $(BUILD_HOST_STATIC_LIBRARY) - -endif # linux - -# -# target libelf -# - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(LIBELF_SRC_FILES) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../lib \ - -LOCAL_C_INCLUDES += $(LOCAL_PATH)/../bionic-fixup - -LOCAL_STATIC_LIBRARIES := libz - -LOCAL_CFLAGS += -DHAVE_CONFIG_H -std=gnu99 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 - -# to suppress the "pointer of type ‘void *’ used in arithmetic" warning -LOCAL_CFLAGS += -Wno-pointer-arith - -LOCAL_CFLAGS += -include $(LOCAL_PATH)/../bionic-fixup/AndroidFixup.h - -LOCAL_MODULE := libelf - -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) - -include $(BUILD_STATIC_LIBRARY) |