Merge "Revert "Add build description for libdw""

4 files changed, 0 insertions, 146 deletions

diff --git a/Android.bp b/Android.bp
index 385004cf..992122f2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,8 +17,6 @@ cc_defaults {
     cflags: [
         "-DHAVE_CONFIG_H",
         "-D_GNU_SOURCE",
-        // upper bound for the number of lines of the resulting mnemonic files
-        "-DNMNES=1000",
         "-std=gnu99",
         "-Werror",
         // to suppress the "pointer of type ‘void *’ used in arithmetic" warning
@@ -29,11 +27,6 @@ cc_defaults {
          "elfutils_headers",
     ],
     export_header_lib_headers: ["elfutils_headers"],
-
-    visibility: [
-        "//external/dwarves:__subpackages__",
-        "//external/elfutils:__subpackages__",
-    ],
 }
 
 cc_library {
@@ -87,50 +80,3 @@ cc_library_headers {
     visibility: [":__subpackages__"],
 }
 
-cc_library_host_static {
-    name: "libdw",
-    defaults: ["elfutils_defaults"],
-    srcs: [
-        "backends/*.c",
-        "libcpu/*_disasm.c",
-        "libdw/*.c",
-        "libdwelf/*.c",
-        "libdwfl/*.c",
-        "libebl/*.c",
-    ],
-    generated_headers: [
-        "i386_dis",
-        "i386_mnemonics",
-        "x86_64_dis",
-        "x86_64_mnemonics",
-    ],
-    exclude_srcs: [
-        // Do not enabled compression support
-        "libdwfl/bzip2.c",
-        "libdwfl/lzma.c",
-        // Those headers are incompatible with clang due to nested function
-        // definitions.
-        "libdwfl/dwfl_segment_report_module.c",
-        "libdwfl/elf-from-memory.c",
-        "libdwfl/link_map.c",
-        // Those are common source files actually used as headers and not
-        // compiled standalone.
-        "backends/common-reloc.c",
-        "backends/linux-core-note.c",
-        "backends/x86_corenote.c",
-    ],
-    local_include_dirs: [
-        "libcpu",
-        "libasm",
-        "libdwelf",
-        "libdwfl",
-        "libebl",
-    ],
-    export_include_dirs: [
-        "libdw",
-    ],
-    static_libs: [
-        "libelf"
-    ],
-}
-
diff --git a/lib/Android.bp b/lib/Android.bp
deleted file mode 100644
index 31647ee5..00000000
--- a/lib/Android.bp
+++ /dev/null
@@ -1,7 +0,0 @@
-cc_library_host_static {
-    name: "libeu",
-    defaults: ["elfutils_defaults"],
-    srcs: ["*.c"],
-    exclude_srcs: ["dynamicsizehash*.c"],
-}
-
diff --git a/libcpu/Android.bp b/libcpu/Android.bp
deleted file mode 100644
index 5ffe48ae..00000000
--- a/libcpu/Android.bp
+++ /dev/null
@@ -1,75 +0,0 @@
-genrule {
-    name: "i386_mnemonics",
-    srcs: [
-        "defs/i386",
-    ],
-    out: ["i386.mnemonics"],
-    cmd: "M4=$(location m4) $(location mnemonic_preprocess.sh) i386 $(in) $(out)",
-    tool_files: [
-        "mnemonic_preprocess.sh",
-    ],
-    tools : [
-        "m4",
-    ]
-}
-
-genrule {
-    name: "x86_64_mnemonics",
-    srcs : [
-        "defs/i386",
-    ],
-    out : ["x86_64.mnemonics"],
-    cmd : "M4=$(location m4) $(location mnemonic_preprocess.sh) x86_64 $(in) $(out)",
-    tool_files : [
-        "mnemonic_preprocess.sh",
-    ],
-    tools : [
-        "m4",
-    ]
-}
-
-cc_binary_host {
-    name: "i386_gendis",
-    defaults: ["elfutils_defaults"],
-    srcs: [
-        "i386_parse.y",
-        "i386_lex.l",
-        "i386_gendis.c",
-    ],
-    yacc: {
-        flags: ["-pi386_",]
-    },
-    lex: {
-        flags: ["-Pi386_",]
-    },
-    static_libs: [
-        "libeu",
-    ],
-}
-
-genrule {
-    name: "i386_dis",
-    srcs: [
-        "defs/i386",
-    ],
-    out: ["i386_dis.h"],
-    cmd: "$(location m4) -Di386 -DDISASSEMBLER $(in) > i386_defs && $(location i386_gendis) i386_defs > $(out)",
-    tools: [
-        "i386_gendis",
-        "m4",
-    ],
-}
-
-genrule {
-    name: "x86_64_dis",
-    srcs: [
-        "defs/i386",
-    ],
-    out: ["x86_64_dis.h"],
-    cmd: "$(location m4) -Dx86_64 -DDISASSEMBLER $(in) > x86_64_defs && $(location i386_gendis) x86_64_defs > $(out)",
-    tools: [
-        "i386_gendis",
-        "m4",
-    ],
-}
-
diff --git a/libcpu/mnemonic_preprocess.sh b/libcpu/mnemonic_preprocess.sh
deleted file mode 100755
index 2b052495..00000000
--- a/libcpu/mnemonic_preprocess.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-arch="$1"
-defs="$2"
-out="$3"
-
-$M4 "-D${arch}" -DDISASSEMBLER "$defs" \
-	| sed "1,/^%%/d;/^#/d;/^[[:space:]]*$/d;s/[^:]*:\([^[:space:]]*\).*/MNE(\\1)/;s/{[^}]*}//g;/INVALID/d" \
-	| sort -u \
-> "$out"