Get zucchini to compile w/o code transformation hack

Test: th
Change-Id: I9b2beec4ee34d1ba23c1af24dec3f4b9169d6bd4

1 files changed, 1 insertions, 23 deletions

diff --git a/Android.bp b/Android.bp
index df2ba83..89dc203 100644
--- a/Android.bp
+++ b/Android.bp
@@ -98,26 +98,6 @@ filegroup {
     ],
 }
 
-// The aosp versions of sources are preprocesseed with include
-// re-written in an AOSP compatible way. Some headers, such as
-// absl, are simply redirected to STL equivalent.
-gensrcs {
-    name: "libzucchini_aosp_srcs",
-    cmd: "$(location aosp/preprocess.py) $(in) $(out)",
-    tool_files: ["aosp/preprocess.py"],
-    srcs: [":libzucchini_srcs"],
-    output_extension: "cc",
-}
-
-gensrcs {
-    name: "libzucchini_aosp_headers",
-    cmd: "$(location aosp/preprocess.py) $(in) $(out)",
-    tool_files: ["aosp/preprocess.py"],
-    srcs: [":libzucchini_headers"],
-    export_include_dirs: ["."],
-    output_extension: "h",
-}
-
 
 cc_library {
     name: "libzucchini",
@@ -126,10 +106,8 @@ cc_library {
     // instead of loacl ones. As the generated headers contain
     // incorrect include paths
     include_build_directory: false,
-    srcs: [":libzucchini_aosp_srcs"],
-    generated_headers: ["libzucchini_aosp_headers"],
+    srcs: [":libzucchini_srcs"],
     local_include_dirs: ["aosp/include"],
-    export_generated_headers: ["libzucchini_aosp_headers"],
     export_include_dirs: ["aosp/include"],
     static_libs: [
         "libchrome",