diff --git a/libc/Android.bp b/libc/Android.bp index 2f21ea87e..b1d077df6 100644 --- a/libc/Android.bp +++ b/libc/Android.bp @@ -1193,13 +1193,6 @@ cc_library_static { name: "libc_bionic", } -genrule { - name: "generated_android_ids", - out: [ "generated_android_ids.h" ], - tool_files: [ "fs_config_generator.py" ], - cmd: "$(location fs_config_generator.py) aidarray system/core/include/private/android_filesystem_config.h > $(out)", -} - // ======================================================== // libc_bionic_ndk.a- The portions of libc_bionic that can // be safely used in libc_ndk.a (no troublesome global data @@ -1388,7 +1381,6 @@ cc_library_static { local_include_dirs: ["stdio"], include_dirs: ["bionic/libstdc++/include"], name: "libc_bionic_ndk", - generated_headers: ["generated_android_ids"], } // ======================================================== diff --git a/libc/bionic/grp_pwd.cpp b/libc/bionic/grp_pwd.cpp index b6b579686..332b2b8f4 100644 --- a/libc/bionic/grp_pwd.cpp +++ b/libc/bionic/grp_pwd.cpp @@ -43,9 +43,6 @@ #include "private/libc_logging.h" #include "private/ThreadLocalBuffer.h" -// Generated android_ids array -#include "generated_android_ids.h" - // POSIX seems to envisage an implementation where the functions are // implemented by brute-force searching with getpwent(3), and the // functions are implemented similarly with getgrent(3). This means that it's diff --git a/libc/fs_config_generator.py b/libc/fs_config_generator.py deleted file mode 120000 index aafb7dc35..000000000 --- a/libc/fs_config_generator.py +++ /dev/null @@ -1 +0,0 @@ -../../build/tools/fs_config/fs_config_generator.py \ No newline at end of file diff --git a/tests/Android.bp b/tests/Android.bp index 0868f6e84..a9d302ae0 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -155,8 +155,6 @@ cc_test_library { shared: { enabled: false, }, - - generated_headers: ["generated_android_ids"], } // ----------------------------------------------------------------------------- diff --git a/tests/grp_pwd_test.cpp b/tests/grp_pwd_test.cpp index a2c31d1ac..a68478071 100644 --- a/tests/grp_pwd_test.cpp +++ b/tests/grp_pwd_test.cpp @@ -30,9 +30,6 @@ #include -// Generated android_ids array -#include "generated_android_ids.h" - enum uid_type_t { TYPE_SYSTEM, TYPE_APP